From db72a40ffa452f944af7eb260f4e3c9f97d69601 Mon Sep 17 00:00:00 2001 From: bra1nwave Date: Mon, 20 Apr 2020 19:58:36 +0200 Subject: [PATCH 1/5] gnuradio: update to 3.8.1.0. [skip ci] --- common/shlibs | 32 ++++++++++++++++---------------- srcpkgs/gnuradio/template | 11 ++++++----- 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/common/shlibs b/common/shlibs index 5f1a09de8dcda5..e8ffddd00f592d 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3203,22 +3203,22 @@ libarcan_tui.so.0.11 arcan-0.5.4.3_1 liblwipv6.so.2 lwipv6-1.5a_1 libpipewire-0.2.so.1 libpipewire-0.2.2_1 libvolk.so.2.2.1 volk-2.2.1_1 -libgnuradio-runtime.so.3.8.0 gnuradio-3.8.0.0_1 -libgnuradio-pmt.so.3.8.0 gnuradio-3.8.0.0_1 -libgnuradio-blocks.so.3.8.0 gnuradio-3.8.0.0_1 -libgnuradio-audio.so.3.8.0 gnuradio-3.8.0.0_1 -libgnuradio-fec.so.3.8.0 gnuradio-3.8.0.0_1 -libgnuradio-fft.so.3.8.0 gnuradio-3.8.0.0_1 -libgnuradio-filter.so.3.8.0 gnuradio-3.8.0.0_1 -libgnuradio-analog.so.3.8.0 gnuradio-3.8.0.0_1 -libgnuradio-digital.so.3.8.0 gnuradio-3.8.0.0_1 -libgnuradio-dtv.so.3.8.0 gnuradio-3.8.0.0_1 -libgnuradio-channels.so.3.8.0 gnuradio-3.8.0.0_1 -libgnuradio-trellis.so.3.8.0 gnuradio-3.8.0.0_1 -libgnuradio-video-sdl.so.3.8.0 gnuradio-3.8.0.0_1 -libgnuradio-vocoder.so.3.8.0 gnuradio-3.8.0.0_1 -libgnuradio-wavelet.so.3.8.0 gnuradio-3.8.0.0_1 -libgnuradio-uhd.so.3.8.0 gnuradio-3.8.0.0_1 +libgnuradio-runtime.so.3.8.1 gnuradio-3.8.1.0_1 +libgnuradio-pmt.so.3.8.1 gnuradio-3.8.1.0_1 +libgnuradio-blocks.so.3.8.1 gnuradio-3.8.1.0_1 +libgnuradio-audio.so.3.8.1 gnuradio-3.8.1.0_1 +libgnuradio-fec.so.3.8.1 gnuradio-3.8.1.0_1 +libgnuradio-fft.so.3.8.1 gnuradio-3.8.1.0_1 +libgnuradio-filter.so.3.8.1 gnuradio-3.8.1.0_1 +libgnuradio-analog.so.3.8.1 gnuradio-3.8.1.0_1 +libgnuradio-digital.so.3.8.1 gnuradio-3.8.1.0_1 +libgnuradio-dtv.so.3.8.1 gnuradio-3.8.1.0_1 +libgnuradio-channels.so.3.8.1 gnuradio-3.8.1.0_1 +libgnuradio-trellis.so.3.8.1 gnuradio-3.8.1.0_1 +libgnuradio-video-sdl.so.3.8.1 gnuradio-3.8.1.0_1 +libgnuradio-vocoder.so.3.8.1 gnuradio-3.8.1.0_1 +libgnuradio-wavelet.so.3.8.1 gnuradio-3.8.1.0_1 +libgnuradio-uhd.so.3.8.1 gnuradio-3.8.1.0_1 libgnuradio-osmosdr.so.0.2.0 gnuradio-osmosdr-0.2.0_1 libflann_cpp.so.1.9 flann-1.9.1_1 libflann.so.1.9 flann-1.9.1_1 diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template index cdc175bdba4c6d..782a072b1f462b 100644 --- a/srcpkgs/gnuradio/template +++ b/srcpkgs/gnuradio/template @@ -1,14 +1,14 @@ -# Template file for 'gnuradio'. +# Template file for 'gnuradio' pkgname=gnuradio -version=3.8.0.0 -revision=4 +version=3.8.1.0 +revision=1 build_style=cmake conf_files="/etc/gnuradio/conf.d/*" configure_args="-DENABLE_INTERNAL_VOLK=OFF -DGR_PYTHON_DIR=${py3_sitelib}" hostmakedepends="pkg-config doxygen swig python3-Mako python3-Sphinx python3-cairo python3-numpy python3-yaml" makedepends="SDL-devel boost-devel fftw-devel gsl-devel jack-devel - libgsm-devel libusb-devel volk-devel uhd-devel gtk+3-devel python3-devel + libgsm-devel volk-devel uhd-devel gtk+3-devel python3-devel python3-gobject-devel log4cpp-devel gmpxx-devel mpir-devel" depends="python3-cheetah3 python3-numpy python3-Mako python3-gobject python3-yaml" @@ -17,7 +17,8 @@ maintainer="Andrew Benson " license="GPL-3.0-or-later" homepage="https://www.gnuradio.org" distfiles="https://github.com/gnuradio/gnuradio/archive/v${version}.tar.gz" -checksum=03fd01f0b27033befb91709b3d56f95e0869b5fb8bc71bec2662266a3f0dedf5 +checksum=4c8647192495756b867062ea2419ba3c47da1fb0dda7e159487adbca275cf9ae +python_version=3 post_install() { rm ${DESTDIR}/usr/share/gnuradio/examples/audio/dial_tone \ From 580c16102901f7ca345cada39f7c73c8c66946e1 Mon Sep 17 00:00:00 2001 From: bra1nwave Date: Tue, 21 Apr 2020 12:13:56 +0200 Subject: [PATCH 2/5] gnuradio-osmosdr: rebuild against gnuradio-3.8.1.0 --- srcpkgs/gnuradio-osmosdr/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnuradio-osmosdr/template b/srcpkgs/gnuradio-osmosdr/template index 17e72935af81f6..543d24af94613e 100644 --- a/srcpkgs/gnuradio-osmosdr/template +++ b/srcpkgs/gnuradio-osmosdr/template @@ -1,10 +1,10 @@ # Template file for 'gnuradio-osmosdr' pkgname=gnuradio-osmosdr version=0.2.0 -revision=1 +revision=2 wrksrc="gr-osmosdr-${version}" build_style=cmake -hostmakedepends="pkg-config swig" +hostmakedepends="pkg-config swig gnuradio" makedepends="boost-devel gnuradio-devel libairspy-devel libhackrf-devel librtlsdr-devel python3-devel uhd-devel log4cpp-devel mpir-devel SoapySDR-devel volk-devel fftw-devel gmpxx-devel" From d1ee3b6d2a5969a8c0c3ce2f699ff2d0c30e21bb Mon Sep 17 00:00:00 2001 From: bra1nwave Date: Tue, 21 Apr 2020 12:14:08 +0200 Subject: [PATCH 3/5] gqrx: rebuild against gnuradio-3.8.1.0 --- srcpkgs/gqrx/template | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gqrx/template b/srcpkgs/gqrx/template index 020e90288aed52..934776b8327802 100644 --- a/srcpkgs/gqrx/template +++ b/srcpkgs/gqrx/template @@ -1,11 +1,11 @@ # Template file for 'gqrx' pkgname=gqrx version=2.12.1 -revision=2 +revision=3 build_style=cmake configure_args="$(vopt_if gr_audio -DLINUX_AUDIO_BACKEND=Gr-audio) $(vopt_if portaudio -DLINUX_AUDIO_BACKEND=Portaudio)" -hostmakedepends="pkg-config" +hostmakedepends="pkg-config gnuradio" makedepends="boost-devel gnuradio-devel gnuradio-osmosdr-devel pulseaudio-devel qt5-svg-devel log4cpp-devel mpir-devel volk-devel fftw-devel python3-devel alsa-lib-devel jack-devel gmpxx-devel @@ -23,6 +23,10 @@ vopt_conflict gr_audio portaudio desc_option_gr_audio="Enable support for GNU Radio audio (ALSA and JACK)" desc_option_portaudio="Enable support for Portaudio" +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" qt5-qmake qt5-host-tools" +fi + post_install() { vinstall gqrx.desktop 644 usr/share/applications vinstall resources/icons/gqrx.svg 644 usr/share/pixmaps From f1d2fc3358cc10b7faee9c6988539935f384f6c3 Mon Sep 17 00:00:00 2001 From: bra1nwave Date: Tue, 21 Apr 2020 12:14:34 +0200 Subject: [PATCH 4/5] gnuradio-rds: rebuild against gnuradio-3.8.1.0 --- srcpkgs/gnuradio-rds/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gnuradio-rds/template b/srcpkgs/gnuradio-rds/template index 82f1c289e80d31..b81adcdeb6b842 100644 --- a/srcpkgs/gnuradio-rds/template +++ b/srcpkgs/gnuradio-rds/template @@ -1,12 +1,12 @@ # Template file for 'gnuradio-rds' pkgname=gnuradio-rds version=3.8.0 -revision=1 +revision=2 wrksrc="gr-rds-${version}" build_style=cmake -hostmakedepends="pkg-config swig" +hostmakedepends="pkg-config swig gnuradio" makedepends="gnuradio-devel python3-devel boost-devel log4cpp-devel - mpir-devel volk-devel" + mpir-devel volk-devel gmpxx-devel" short_desc="GNUradio FM RDS/TMC Transceiver" maintainer="Remi Pommarel " license="GPL-2.0-or-later" From cd99aa096eb5d600d324503e250a5afa3917ee6f Mon Sep 17 00:00:00 2001 From: bra1nwave Date: Tue, 21 Apr 2020 12:14:52 +0200 Subject: [PATCH 5/5] gnuradio-nrsc5: rebuild against gnuradio-3.8.1.0 --- srcpkgs/gnuradio-nrsc5/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gnuradio-nrsc5/template b/srcpkgs/gnuradio-nrsc5/template index 7870d029cf7d8c..8ea46b97399a85 100644 --- a/srcpkgs/gnuradio-nrsc5/template +++ b/srcpkgs/gnuradio-nrsc5/template @@ -1,18 +1,19 @@ # Template file for 'gnuradio-nrsc5' pkgname=gnuradio-nrsc5 version=1.0.0 -revision=3 +revision=4 wrksrc="gr-nrsc5-${version}" build_style=cmake -hostmakedepends="git autoconf automake libtool swig pkg-config" +hostmakedepends="git autoconf automake libtool swig pkg-config gnuradio" makedepends="gnuradio-devel boost-devel libcppunit-devel python3-devel - log4cpp-devel mpir-devel gsl-devel volk-devel" + log4cpp-devel mpir-devel gsl-devel volk-devel gmpxx-devel" short_desc="GNU Radio implementation of HD Radio" maintainer="Remi Pommarel " license="GPL-3.0-or-later" homepage="https://github.com/argilo/gr-nrsc5/" distfiles="https://github.com/argilo/gr-nrsc5/archive/v${version}.tar.gz" checksum=d736c4cb1104254d07296d2a61880e07149c9bfd1a49aed504215672d4e09485 +nocross=yes gnuradio-nrsc5-devel_package() { depends="${makedepends} ${sourcepkg}-${version}_${revision}"