jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

gnuradio: revbump for gsl-2.7.1

Browse source 
Also fix do_check() step:
 - add python3-scipy to checkdepends, required by some tests
 - add three patches from upstream that fix some other tests
 - add a patch to (conditionally) skip a test that hangs on 32 bit

Note: on i686 2 tests fail (qa_ctcss_squelch, qa_constellation)
This commit is contained in:
Gonzalo Tornaría 2021-12-05 18:34:45 -03:00 committed by Leah Neukirchen
parent a3f71d7f8a
commit 6932a65a55
5 changed files with 133 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
srcpkgs/gnuradio/patches/596c6495f3bdf579dae0c26531a16f6adcc7fb2f.patch Normal file
View file

@ -0,0 +1,46 @@
From 596c6495f3bdf579dae0c26531a16f6adcc7fb2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcus=20M=C3=BCller?= <mmueller@gnuradio.org>
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)

28
srcpkgs/gnuradio/patches/aa4b15d0b26b3c72fab736bcd28a67ab9d1404b7.patch Normal file
View file

@ -0,0 +1,28 @@
From aa4b15d0b26b3c72fab736bcd28a67ab9d1404b7 Mon Sep 17 00:00:00 2001
From: John Sallay <jasallay@gmail.com>
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 <jasallay@gmail.com>
---
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()

31
srcpkgs/gnuradio/patches/f259befbbe54e55fc4994899e92bcf5bf462fa2f.patch Normal file
View file

@ -0,0 +1,31 @@
From f259befbbe54e55fc4994899e92bcf5bf462fa2f Mon Sep 17 00:00:00 2001
From: alekhgupta1441 <alekhgupta1441@gmail.com>
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)

26
srcpkgs/gnuradio/patches/skip-test-that-hangs-on-32bit.patch Normal file
View file

@ -0,0 +1,26 @@
Skip one test that hangs forever on 32 bit
See: https://github.com/gnuradio/gnuradio/issues/989
--- a/gr-fec/python/fec/qa_fecapi_ldpc.py 2019-08-09 18:15:36.000000000 -0300
+++ b/gr-fec/python/fec/qa_fecapi_ldpc.py 2021-12-28 12:56:31.635977173 -0300
@@ -98,6 +98,9 @@
self.assertEqual(data_in, data_out)
def test_parallelism0_03(self):
+ from ctypes import sizeof, c_long
+ if sizeof(c_long) <= 4:
+ return
filename = LDPC_ALIST_DIR + "n_0100_k_0058_gen_matrix.alist"
gap = 4
LDPC_matrix_object = fec.ldpc_G_matrix(filename)
@@ -115,6 +118,9 @@
self.assertEqual(data_in, data_out)
def test_parallelism0_03(self):
+ from ctypes import sizeof, c_long
+ if sizeof(c_long) <= 4:
+ return
filename = LDPC_ALIST_DIR + "n_0100_k_0058_gen_matrix.alist"
gap = 4
k = 100 - 58

3
srcpkgs/gnuradio/template
View file

@ -1,7 +1,7 @@
# Template file for 'gnuradio'
pkgname=gnuradio
version=3.8.0.0
revision=8
revision=9
build_style=cmake
conf_files="/etc/gnuradio/conf.d/*"
configure_args="-DENABLE_INTERNAL_VOLK=OFF -DGR_PYTHON_DIR=/${py3_sitelib}"
@ -12,6 +12,7 @@ makedepends="SDL-devel boost-devel fftw-devel gsl-devel jack-devel
python3-gobject-devel log4cpp-devel gmpxx-devel mpir-devel"
depends="python3-cheetah3 python3-numpy python3-Mako python3-gobject
python3-yaml"
checkdepends="python3-scipy"
short_desc="Framework for software defined radio"
maintainer="Andrew Benson <abenson+void@gmail.com>"
license="GPL-3.0-or-later"