From ec3b2008b0f0d1a35d49e3c9c0d633737d0e6bb9 Mon Sep 17 00:00:00 2001 From: Noah Huppert Date: Sun, 17 Jul 2022 12:09:45 -0400 Subject: [PATCH] gnuradio: updated to 3.8.5.0, added qt blocks support --- common/shlibs | 32 ++++++------- ...6495f3bdf579dae0c26531a16f6adcc7fb2f.patch | 46 ------------------- ...15d0b26b3c72fab736bcd28a67ab9d1404b7.patch | 28 ----------- ...befbbe54e55fc4994899e92bcf5bf462fa2f.patch | 31 ------------- srcpkgs/gnuradio/template | 11 +++-- 5 files changed, 22 insertions(+), 126 deletions(-) delete mode 100644 srcpkgs/gnuradio/patches/596c6495f3bdf579dae0c26531a16f6adcc7fb2f.patch delete mode 100644 srcpkgs/gnuradio/patches/aa4b15d0b26b3c72fab736bcd28a67ab9d1404b7.patch delete mode 100644 srcpkgs/gnuradio/patches/f259befbbe54e55fc4994899e92bcf5bf462fa2f.patch diff --git a/common/shlibs b/common/shlibs index 3dda6cfafbc17a..1c8b40086dad7c 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3249,22 +3249,22 @@ liblwipv6.so.2 lwipv6-1.5a_1 libpipewire-0.2.so.1 libpipewire0.2-0.2.7_1 libpipewire-0.3.so.0 libpipewire-0.3.6_1 libvolk.so.2.5 volk-2.5.0_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.5 gnuradio-3.8.5.0_1 +libgnuradio-pmt.so.3.8.5 gnuradio-3.8.5.0_1 +libgnuradio-blocks.so.3.8.5 gnuradio-3.8.5.0_1 +libgnuradio-audio.so.3.8.5 gnuradio-3.8.5.0_1 +libgnuradio-fec.so.3.8.5 gnuradio-3.8.5.0_1 +libgnuradio-fft.so.3.8.5 gnuradio-3.8.5.0_1 +libgnuradio-filter.so.3.8.5 gnuradio-3.8.5.0_1 +libgnuradio-analog.so.3.8.5 gnuradio-3.8.5.0_1 +libgnuradio-digital.so.3.8.5 gnuradio-3.8.5.0_1 +libgnuradio-dtv.so.3.8.5 gnuradio-3.8.5.0_1 +libgnuradio-channels.so.3.8.5 gnuradio-3.8.5.0_1 +libgnuradio-trellis.so.3.8.5 gnuradio-3.8.5.0_1 +libgnuradio-video-sdl.so.3.8.5 gnuradio-3.8.5.0_1 +libgnuradio-vocoder.so.3.8.5 gnuradio-3.8.5.0_1 +libgnuradio-wavelet.so.3.8.5 gnuradio-3.8.5.0_1 +libgnuradio-uhd.so.3.8.5 gnuradio-3.8.5.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/patches/596c6495f3bdf579dae0c26531a16f6adcc7fb2f.patch b/srcpkgs/gnuradio/patches/596c6495f3bdf579dae0c26531a16f6adcc7fb2f.patch deleted file mode 100644 index 51952bd29b3890..00000000000000 --- a/srcpkgs/gnuradio/patches/596c6495f3bdf579dae0c26531a16f6adcc7fb2f.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 596c6495f3bdf579dae0c26531a16f6adcc7fb2f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Marcus=20M=C3=BCller?= -Date: Mon, 13 Apr 2020 00:11:59 +0200 -Subject: [PATCH] =?UTF-8?q?pmt:=20conditionalize=20testing=20of=20long=20>?= - =?UTF-8?q?=202=C2=B3=C2=B2=20on=20sizeof(long)?= -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - ---- - gnuradio-runtime/python/pmt/qa_pmt.py | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/gnuradio-runtime/python/pmt/qa_pmt.py b/gnuradio-runtime/python/pmt/qa_pmt.py -index 884bba7dd4b..44f616cdae1 100644 ---- a/gnuradio-runtime/python/pmt/qa_pmt.py -+++ b/gnuradio-runtime/python/pmt/qa_pmt.py -@@ -18,6 +18,10 @@ class test_pmt(unittest.TestCase): - MAXINT32 = (2**31)-1 - MININT32 = (-MAXINT32)-1 - -+ def setUp(self): -+ from ctypes import sizeof, c_long -+ self.sizeof_long = sizeof(c_long) -+ - def test01(self): - a = pmt.intern("a") - b = pmt.from_double(123765) -@@ -112,6 +116,8 @@ def test14(self): - self.assertEqual(const,pmt.to_long(deser)) - - def test15(self): -+ if(self.sizeof_long <= 4): -+ return - const = self.MAXINT32 + 1 - x_pmt = pmt.from_long(const) - s = pmt.serialize_str(x_pmt) -@@ -137,6 +143,8 @@ def test17(self): - self.assertEqual(const, x_long) - - def test18(self): -+ if(self.sizeof_long <= 4): -+ return - const = self.MININT32 - 1 - x_pmt = pmt.from_long(const) - s = pmt.serialize_str(x_pmt) diff --git a/srcpkgs/gnuradio/patches/aa4b15d0b26b3c72fab736bcd28a67ab9d1404b7.patch b/srcpkgs/gnuradio/patches/aa4b15d0b26b3c72fab736bcd28a67ab9d1404b7.patch deleted file mode 100644 index c49a047427e834..00000000000000 --- a/srcpkgs/gnuradio/patches/aa4b15d0b26b3c72fab736bcd28a67ab9d1404b7.patch +++ /dev/null @@ -1,28 +0,0 @@ -From aa4b15d0b26b3c72fab736bcd28a67ab9d1404b7 Mon Sep 17 00:00:00 2001 -From: John Sallay -Date: Sat, 23 Oct 2021 08:26:42 -0400 -Subject: [PATCH] Fix issue 4595 qa_agc Assertion Error. - -The number of input elements needs to be disivible by volk_alignment, which it wasn't -for machines with 512-bit registers. - -Signed-off-by: John Sallay ---- - gr-analog/python/analog/qa_agc.py | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/gr-analog/python/analog/qa_agc.py b/gr-analog/python/analog/qa_agc.py -index a5a8ea47b6a..9368dd5d2a8 100644 ---- a/gr-analog/python/analog/qa_agc.py -+++ b/gr-analog/python/analog/qa_agc.py -@@ -454,7 +454,9 @@ def test_006(self): - tb = self.tb - - sampling_freq = 100 -- N = int(5*sampling_freq) -+ # N must by a multiple of the volk_alignment of the system for this test to work. -+ # For a machine with 512-bit registers, that would be 8 complex-floats. -+ N = int(8 * sampling_freq) - src1 = analog.sig_source_c(sampling_freq, analog.GR_SIN_WAVE, - sampling_freq * 0.10, 100) - dst1 = blocks.vector_sink_c() diff --git a/srcpkgs/gnuradio/patches/f259befbbe54e55fc4994899e92bcf5bf462fa2f.patch b/srcpkgs/gnuradio/patches/f259befbbe54e55fc4994899e92bcf5bf462fa2f.patch deleted file mode 100644 index 4faa3468140a54..00000000000000 --- a/srcpkgs/gnuradio/patches/f259befbbe54e55fc4994899e92bcf5bf462fa2f.patch +++ /dev/null @@ -1,31 +0,0 @@ -From f259befbbe54e55fc4994899e92bcf5bf462fa2f Mon Sep 17 00:00:00 2001 -From: alekhgupta1441 -Date: Sun, 12 Apr 2020 03:48:14 +0530 -Subject: [PATCH] gr-digital/python : Updated soft_dec_lut_gen.py - ---- - gr-digital/python/digital/soft_dec_lut_gen.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/gr-digital/python/digital/soft_dec_lut_gen.py b/gr-digital/python/digital/soft_dec_lut_gen.py -index 4503c4fea7b..84f6de66e45 100644 ---- a/gr-digital/python/digital/soft_dec_lut_gen.py -+++ b/gr-digital/python/digital/soft_dec_lut_gen.py -@@ -73,7 +73,7 @@ def soft_dec_table_generator(soft_dec_gen, prec, Es=1): - - ''' - -- npts = 2.0**prec -+ npts = int(2.0**prec) - maxd = Es*numpy.sqrt(2.0)/2.0 - yrng = numpy.linspace(-maxd, maxd, npts) - xrng = numpy.linspace(-maxd, maxd, npts) -@@ -110,7 +110,7 @@ def soft_dec_table(constel, symbols, prec, npwr=1): - re_max = max(numpy.array(constel).real) - im_max = max(numpy.array(constel).imag) - -- npts = 2.0**prec -+ npts = int(2.0**prec) - yrng = numpy.linspace(im_min, im_max, npts) - xrng = numpy.linspace(re_min, re_max, npts) - diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template index c950b53e8bea1a..e458f6b62486b5 100644 --- a/srcpkgs/gnuradio/template +++ b/srcpkgs/gnuradio/template @@ -1,7 +1,7 @@ # Template file for 'gnuradio' pkgname=gnuradio -version=3.8.0.0 -revision=9 +version=3.8.5.0 +revision=1 build_style=cmake conf_files="/etc/gnuradio/conf.d/*" configure_args="-DENABLE_INTERNAL_VOLK=OFF -DGR_PYTHON_DIR=/${py3_sitelib}" @@ -9,7 +9,7 @@ hostmakedepends="pkg-config doxygen swig python3-Mako python3-Sphinx python3-cairo python3-numpy python3-yaml texlive texlive-latexextra texlive-dvi" makedepends="SDL-devel boost-devel fftw-devel gsl-devel jack-devel libgsm-devel libusb-devel volk-devel uhd-devel gtk+3-devel python3-devel - python3-gobject-devel log4cpp-devel gmpxx-devel mpir-devel" + python3-gobject-devel log4cpp-devel gmpxx-devel mpir-devel qt5-devel qwt-devel python3-PyQt5-tools" depends="python3-cheetah3 python3-numpy python3-Mako python3-gobject python3-yaml" checkdepends="python3-scipy" @@ -18,12 +18,13 @@ 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=492fe7d84fbd7a5106465326dc9fef5935288ea8f749d6038461a21eda649d13 python_version=3 post_install() { rm ${DESTDIR}/usr/share/gnuradio/examples/audio/dial_tone \ - ${DESTDIR}/usr/share/gnuradio/examples/uhd/tags_demo + ${DESTDIR}/usr/share/gnuradio/examples/uhd/tags_demo \ + ${DESTDIR}/usr/share/gnuradio/examples/qt-gui/display_qt vinstall grc/scripts/freedesktop/gnuradio-grc.desktop 644 \ usr/share/applications vinstall grc/scripts/freedesktop/gnuradio_logo_icon-square.svg 644 \