| Message ID | 20170210140112.26552-1-gwenj@trabucayre.com |
|---|---|
| State | Accepted |
| Headers | show |
Hello, On Fri, 10 Feb 2017 15:01:12 +0100, Gwenhael Goavec-Merou wrote: > From: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com> > > Gqrx is an open source software defined radio (SDR) receiver implemented > using GNU Radio and the Qt GUI toolkit. Currently it works on Linux > and Mac with hardware supported by gr-osmosdr, including Funcube Dongle, > RTL-SDR, Airspy, HackRF, BladeRF, RFSpace, USRP and SoapySDR. > > Gqrx can operate as an AM/FM/SSB receiver with audio output or as an > FFT-only instrument. There are also various hooks for interacting > with external application using network sockets. > > Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com> > Reviewed-by: Romain Naour <romain.naour@gmail.com> I've applied to the next branch, after fixing a few issues, see below. > package/Config.in | 1 + > package/gqrx/0001-fix_compilation_in_gcc-6.patch | 34 +++++++++++++++++++ > package/gqrx/Config.in | 43 ++++++++++++++++++++++++ > package/gqrx/gqrx.hash | 2 ++ > package/gqrx/gqrx.mk | 15 +++++++++ You forgot to add an entry to the DEVELOPERS file, so I've added that. This way you'll receive notifications when there are build failures! :-) > diff --git a/package/gqrx/0001-fix_compilation_in_gcc-6.patch b/package/gqrx/0001-fix_compilation_in_gcc-6.patch > new file mode 100644 > index 0000000..e1824c3 > --- /dev/null > +++ b/package/gqrx/0001-fix_compilation_in_gcc-6.patch > @@ -0,0 +1,34 @@ > +From e6baaee4968345a53e977f593362267a91041cff Mon Sep 17 00:00:00 2001 > +From: Valentin Ochs <a@0au.de> > +Date: Fri, 21 Oct 2016 20:12:50 +0200 > +Subject: [PATCH 05/34] Cosmetic & readability changes This 05/34 doesn't make sense in the context of Buildroot, so I've dropped that. > diff --git a/package/gqrx/Config.in b/package/gqrx/Config.in > new file mode 100644 > index 0000000..c6bef76 > --- /dev/null > +++ b/package/gqrx/Config.in > @@ -0,0 +1,43 @@ > +comment "gqrx needs a toolchain w/ C++, threads, wchar, dynamic library" > + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ > + !BR2_USE_WCHAR || BR2_STATIC_LIBS > + > +comment "gqrx needs qt5, gnuradio, fftw's single precision, alsa-lib or portaudio" > + depends on !BR2_PACKAGE_GNURADIO || !BR2_PACKAGE_FFTW_PRECISION_SINGLE || \ > + !(BR2_PACKAGE_ALSA_LIB || BR2_PACKAGE_PORTAUDIO) || !BR2_PACKAGE_QT5 > + > +config BR2_PACKAGE_GQRX > + bool "gqrx" > + depends on BR2_PACKAGE_ALSA_LIB || BR2_PACKAGE_PORTAUDIO # gr-audio Not the default of this package, but this is really annoying. What do you think of changing the BR2_PACKAGE_GNURADIO_AUDIO option to do this: select BR2_PACKAGE_ALSA_LIB if !BR2_PACKAGE_PORTAUDIO This way, we're sure at least one of the two is selected, and we can then directly "select BR2_PACKAGE_GNURADIO_AUDIO" within having to worry about this anymore. > + depends on BR2_PACKAGE_FFTW_PRECISION_SINGLE # gnuradio This one is also annoying. Did you see the work that was posted on the mailing list a while ago to allow building all variants of fftw? This would allow to select the fftw package like any other. It would be really really better. If you have some time to pick up this work and finalize it, it would be nice. > + depends on BR2_PACKAGE_GNURADIO > + depends on BR2_PACKAGE_QT5 > + depends on BR2_INSTALL_LIBSTDCPP # boost, qt5 > + depends on !BR2_STATIC_LIBS # qt5 > + depends on BR2_TOOLCHAIN_HAS_THREADS # boost, qt5 > + depends on BR2_USE_WCHAR # boost, qt5 Since you're using "depends on BR2_PACKAGE_QT5", there is no need to replicate the Qt5 dependencies here. So I've dropped the ", qt5" comments and the BR2_STATIC_LIBS dependency. Thanks! Thomas
On Sun, 12 Feb 2017 15:53:48 +0100 Thomas Petazzoni <thomas.petazzoni@free-electrons.com> wrote: > Hello, > > On Fri, 10 Feb 2017 15:01:12 +0100, Gwenhael Goavec-Merou wrote: > > From: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com> > > [...] > > > diff --git a/package/gqrx/Config.in b/package/gqrx/Config.in > > new file mode 100644 > > index 0000000..c6bef76 > > --- /dev/null > > +++ b/package/gqrx/Config.in > > @@ -0,0 +1,43 @@ > > +comment "gqrx needs a toolchain w/ C++, threads, wchar, dynamic > > library" > > + depends on !BR2_INSTALL_LIBSTDCPP > > || !BR2_TOOLCHAIN_HAS_THREADS || \ > > + !BR2_USE_WCHAR || BR2_STATIC_LIBS > > + > > +comment "gqrx needs qt5, gnuradio, fftw's single precision, > > alsa-lib or portaudio" > > + depends on !BR2_PACKAGE_GNURADIO > > || !BR2_PACKAGE_FFTW_PRECISION_SINGLE || \ > > + !(BR2_PACKAGE_ALSA_LIB || BR2_PACKAGE_PORTAUDIO) > > || !BR2_PACKAGE_QT5 + > > +config BR2_PACKAGE_GQRX > > + bool "gqrx" > > + depends on BR2_PACKAGE_ALSA_LIB || BR2_PACKAGE_PORTAUDIO # > > gr-audio > > Not the default of this package, but this is really annoying. What do > you think of changing the BR2_PACKAGE_GNURADIO_AUDIO option to do > this: > > select BR2_PACKAGE_ALSA_LIB if !BR2_PACKAGE_PORTAUDIO > > This way, we're sure at least one of the two is selected, and we can > then directly "select BR2_PACKAGE_GNURADIO_AUDIO" within having to > worry about this anymore. > I'm agree, maybe portaudio by default because gnuradio users seems to use it preferentially. > > + depends on BR2_PACKAGE_FFTW_PRECISION_SINGLE # gnuradio > > This one is also annoying. Did you see the work that was posted on the > mailing list a while ago to allow building all variants of fftw? This > would allow to select the fftw package like any other. It would be > really really better. If you have some time to pick up this work and > finalize it, it would be nice. > Thanks to highlight this patch because I've missed this one. I've, recently, looking at a way to build all flavors for this package instead of just one. Currently, according to the precision specified, fftw produce a dynamic library with a name corresponding to the precision. All others files (headers and doc) are the same and there are no risk with overwrite. I must update this patch. [...] > > Thanks! > > Thomas Thanks Gwen
Hello, On Mon, 13 Feb 2017 09:38:39 +0100, gwenhael.goavec wrote: > I'm agree, maybe portaudio by default because gnuradio users seems to > use it preferentially. OK. portaudio only depends on thread support, and gnuradio already needs thread support anyway. So you can directly: select BR2_PACKAGE_PORTAUDIO if !BR2_PACKAGE_ALSA_LIB in the BR2_PACKAGE_GNURADIO_AUDIO option. > > > + depends on BR2_PACKAGE_FFTW_PRECISION_SINGLE # gnuradio > > > > This one is also annoying. Did you see the work that was posted on the > > mailing list a while ago to allow building all variants of fftw? This > > would allow to select the fftw package like any other. It would be > > really really better. If you have some time to pick up this work and > > finalize it, it would be nice. > > > Thanks to highlight this patch because I've missed this one. I've, > recently, looking at a way to build all flavors for this package > instead of just one. > Currently, according to the precision specified, fftw produce a dynamic > library with a name corresponding to the precision. All others files > (headers and doc) are the same and there are no risk with overwrite. > I must update this patch. That would be nice. However, there were some issues with the patch, so it is not going to be good as-is. Make sure to read the discussion I had with the original submitter. I remember spending quite some time interacting with him/her to try to find a good solution (but that wasn't trivial). Thanks! Thomas
On Mon, 13 Feb 2017 13:35:07 +0100 Thomas Petazzoni <thomas.petazzoni@free-electrons.com> wrote: > Hello, > > On Mon, 13 Feb 2017 09:38:39 +0100, gwenhael.goavec wrote: > > > I'm agree, maybe portaudio by default because gnuradio users seems > > to use it preferentially. > > OK. portaudio only depends on thread support, and gnuradio already > needs thread support anyway. So you can directly: > > select BR2_PACKAGE_PORTAUDIO if !BR2_PACKAGE_ALSA_LIB > > in the BR2_PACKAGE_GNURADIO_AUDIO option. this modification produce : package/alsa-lib/Config.in:4:error: recursive dependency detected! package/alsa-lib/Config.in:4: symbol BR2_PACKAGE_ALSA_LIB is selected by BR2_PACKAGE_PORTAUDIO_ALSA package/portaudio/Config.in:15: symbol BR2_PACKAGE_PORTAUDIO_ALSA depends on BR2_PACKAGE_PORTAUDIO package/portaudio/Config.in:4: symbol BR2_PACKAGE_PORTAUDIO is selected by BR2_PACKAGE_ALSA_LIB I think the first solution (select BR2_PACKAGE_ALSA_LIB), to have a default backend, is the most simpliest. > > > > > + depends on BR2_PACKAGE_FFTW_PRECISION_SINGLE # > > > > gnuradio > > > > > > This one is also annoying. Did you see the work that was posted > > > on the mailing list a while ago to allow building all variants of > > > fftw? This would allow to select the fftw package like any other. > > > It would be really really better. If you have some time to pick > > > up this work and finalize it, it would be nice. > > > > > Thanks to highlight this patch because I've missed this one. I've, > > recently, looking at a way to build all flavors for this package > > instead of just one. > > Currently, according to the precision specified, fftw produce a > > dynamic library with a name corresponding to the precision. All > > others files (headers and doc) are the same and there are no risk > > with overwrite. I must update this patch. > > That would be nice. However, there were some issues with the patch, so > it is not going to be good as-is. Of course. > Make sure to read the discussion I > had with the original submitter. I remember spending quite some time > interacting with him/her to try to find a good solution (but that > wasn't trivial). > I know. I must check everything to have my opinion about this... But I think more than one version of this patch will be needed. > > Thanks! > > Thomas > -- Gwen
Hello, On Mon, 13 Feb 2017 16:01:25 +0100, gwenhael.goavec wrote: > > in the BR2_PACKAGE_GNURADIO_AUDIO option. > this modification produce : > package/alsa-lib/Config.in:4:error: recursive dependency detected! > package/alsa-lib/Config.in:4: symbol BR2_PACKAGE_ALSA_LIB is selected > by BR2_PACKAGE_PORTAUDIO_ALSA package/portaudio/Config.in:15: symbol > BR2_PACKAGE_PORTAUDIO_ALSA depends on BR2_PACKAGE_PORTAUDIO > package/portaudio/Config.in:4: symbol BR2_PACKAGE_PORTAUDIO is > selected by BR2_PACKAGE_ALSA_LIB Gah, yes, indeed. > I think the first solution (select BR2_PACKAGE_ALSA_LIB), to have a > default backend, is the most simpliest. Yes, I think too. > > Make sure to read the discussion I > > had with the original submitter. I remember spending quite some time > > interacting with him/her to try to find a good solution (but that > > wasn't trivial). > > I know. I must check everything to have my opinion about this... But I > think more than one version of this patch will be needed. Sure, no problem. Thomas
diff --git a/package/Config.in b/package/Config.in index deff0fe..e78fb75 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1451,6 +1451,7 @@ menu "Miscellaneous" source "package/empty/Config.in" source "package/gnuradio/Config.in" source "package/googlefontdirectory/Config.in" + source "package/gqrx/Config.in" source "package/gr-osmosdr/Config.in" source "package/gsettings-desktop-schemas/Config.in" source "package/haveged/Config.in" diff --git a/package/gqrx/0001-fix_compilation_in_gcc-6.patch b/package/gqrx/0001-fix_compilation_in_gcc-6.patch new file mode 100644 index 0000000..e1824c3 --- /dev/null +++ b/package/gqrx/0001-fix_compilation_in_gcc-6.patch @@ -0,0 +1,34 @@ +From e6baaee4968345a53e977f593362267a91041cff Mon Sep 17 00:00:00 2001 +From: Valentin Ochs <a@0au.de> +Date: Fri, 21 Oct 2016 20:12:50 +0200 +Subject: [PATCH 05/34] Cosmetic & readability changes + +Backport patch from +https://github.com/csete/gqrx/commit/e6baaee4968345a53e977f593362267a91041cff + +Fix compilation in gcc-6 + +Signed-off-by: Valentin Ochs <a@0au.de> +Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com> +--- +diff --git a/src/qtgui/plotter.cpp b/src/qtgui/plotter.cpp +index e491632..b877546 100644 +--- a/src/qtgui/plotter.cpp ++++ b/src/qtgui/plotter.cpp +@@ -1336,8 +1336,11 @@ void CPlotter::drawOverlay() + #endif + + int level = 0; +- for (; level < nLevels && tagEnd[level] > x; level++); +- level %= nLevels; ++ while(level < nLevels && tagEnd[level] > x) ++ level++; ++ ++ if(level == nLevels) ++ level = 0; + + tagEnd[level] = x + nameWidth + slant - 1; + m_BookmarkTags.append(qMakePair<QRect, qint64>(QRect(x, level * levelHeight, nameWidth + slant, fontHeight), bookmarks[i].frequency)); +-- +2.10.2 + diff --git a/package/gqrx/Config.in b/package/gqrx/Config.in new file mode 100644 index 0000000..c6bef76 --- /dev/null +++ b/package/gqrx/Config.in @@ -0,0 +1,43 @@ +comment "gqrx needs a toolchain w/ C++, threads, wchar, dynamic library" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_USE_WCHAR || BR2_STATIC_LIBS + +comment "gqrx needs qt5, gnuradio, fftw's single precision, alsa-lib or portaudio" + depends on !BR2_PACKAGE_GNURADIO || !BR2_PACKAGE_FFTW_PRECISION_SINGLE || \ + !(BR2_PACKAGE_ALSA_LIB || BR2_PACKAGE_PORTAUDIO) || !BR2_PACKAGE_QT5 + +config BR2_PACKAGE_GQRX + bool "gqrx" + depends on BR2_PACKAGE_ALSA_LIB || BR2_PACKAGE_PORTAUDIO # gr-audio + depends on BR2_PACKAGE_FFTW_PRECISION_SINGLE # gnuradio + depends on BR2_PACKAGE_GNURADIO + depends on BR2_PACKAGE_QT5 + depends on BR2_INSTALL_LIBSTDCPP # boost, qt5 + depends on !BR2_STATIC_LIBS # qt5 + depends on BR2_TOOLCHAIN_HAS_THREADS # boost, qt5 + depends on BR2_USE_WCHAR # boost, qt5 + select BR2_PACKAGE_BOOST + select BR2_PACKAGE_BOOST_PROGRAM_OPTIONS + select BR2_PACKAGE_BOOST_SYSTEM + select BR2_PACKAGE_GNURADIO_ANALOG + select BR2_PACKAGE_GNURADIO_AUDIO + select BR2_PACKAGE_GNURADIO_BLOCKS + select BR2_PACKAGE_GNURADIO_DIGITAL + select BR2_PACKAGE_GNURADIO_FFT + select BR2_PACKAGE_GNURADIO_FILTER + select BR2_PACKAGE_GR_OSMOSDR + select BR2_PACKAGE_QT5BASE_GUI + select BR2_PACKAGE_QT5BASE_WIDGETS + select BR2_PACKAGE_QT5SVG + help + Gqrx is an open source software defined radio (SDR) receiver + implemented using GNU Radio and the Qt GUI toolkit. Currently + it works on Linux and Mac with hardware supported by gr-osmosdr, + including Funcube Dongle, RTL-SDR, Airspy, HackRF, BladeRF, + RFSpace, USRP and SoapySDR. + + Gqrx can operate as an AM/FM/SSB receiver with audio output or + as an FFT-only instrument. There are also various hooks for + interacting with external application using network sockets. + + http://gqrx.dk/ diff --git a/package/gqrx/gqrx.hash b/package/gqrx/gqrx.hash new file mode 100644 index 0000000..2d126aa --- /dev/null +++ b/package/gqrx/gqrx.hash @@ -0,0 +1,2 @@ +# Locally calculated: +sha256 53d25db8d987a41ccccaf6fd85262bd7770cdfab5539b5901c4558756483c9db gqrx-v2.6.tar.gz diff --git a/package/gqrx/gqrx.mk b/package/gqrx/gqrx.mk new file mode 100644 index 0000000..b591e60 --- /dev/null +++ b/package/gqrx/gqrx.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# gqrx +# +################################################################################ + +GQRX_VERSION = v2.6 +GQRX_SITE = $(call github,csete,gqrx,$(GQRX_VERSION)) +GQRX_LICENSE = GPLv3+, Apache-2.0 +GQRX_LICENSE_FILES = COPYING LICENSE-CTK +GQRX_DEPENDENCIES = boost gnuradio gr-osmosdr qt5base qt5svg + +GQRX_CONF_OPTS = -DLINUX_AUDIO_BACKEND=Gr-audio + +$(eval $(cmake-package))