From 469524b1b9b0598d4d78058b608449959bbcb350 Mon Sep 17 00:00:00 2001 From: Evgeny Ermakov Date: Sat, 15 Jan 2022 12:43:05 +1100 Subject: [PATCH 1/2] New package: libiio-0.23 --- common/shlibs | 1 + srcpkgs/libiio-devel | 1 + srcpkgs/libiio-tools | 1 + srcpkgs/libiio/template | 42 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 45 insertions(+) create mode 120000 srcpkgs/libiio-devel create mode 120000 srcpkgs/libiio-tools create mode 100644 srcpkgs/libiio/template diff --git a/common/shlibs b/common/shlibs index c4b2c348f6f3..96ba87e335af 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4098,3 +4098,4 @@ libkmailconfirmbeforedeleting.so.5 kdepim-addons-21.08.3_1 libkaddressbookprivate.so.5 kaddressbook-21.08.3_1 libcodec2.so.1.0 codec2-1.0.1_1 libx86emu.so.3 libx86emu-3.4_1 +libiio.so.0 libiio-0.23_1 diff --git a/srcpkgs/libiio-devel b/srcpkgs/libiio-devel new file mode 120000 index 000000000000..0885e8969722 --- /dev/null +++ b/srcpkgs/libiio-devel @@ -0,0 +1 @@ +libiio \ No newline at end of file diff --git a/srcpkgs/libiio-tools b/srcpkgs/libiio-tools new file mode 120000 index 000000000000..0885e8969722 --- /dev/null +++ b/srcpkgs/libiio-tools @@ -0,0 +1 @@ +libiio \ No newline at end of file diff --git a/srcpkgs/libiio/template b/srcpkgs/libiio/template new file mode 100644 index 000000000000..149371c250e9 --- /dev/null +++ b/srcpkgs/libiio/template @@ -0,0 +1,42 @@ +# Template file for 'libiio' +pkgname=libiio +version=0.23 +revision=1 +build_style=cmake +configure_args="-DUDEV_RULES_INSTALL_DIR=/usr/lib/udev/rules.d -DWITH_SERIAL_BACKEND=YES + $(vopt_bool avahi HAVE_DNS_SD) $(vopt_bool doc WITH_DOC) $(vopt_bool python PYTHON_BINDINGS)" +hostmakedepends="bison flex $(vopt_if doc doxygen) + $(vopt_if python 'python3 python3-Sphinx python3-sphinx_rtd_theme')" +makedepends="libaio-devel libserialport-devel libusb-devel libxml2-devel + $(vopt_if avahi avahi-libs-devel)" +short_desc="Library for interfacing with local and remote Linux IIO devices" +maintainer="Evgeny Ermakov " +license="LGPL-2.1-or-later" +homepage="https://analogdevicesinc.github.io/libiio" +distfiles="https://github.com/analogdevicesinc/libiio/archive/v${version}.tar.gz" +checksum=df1577740ea93dca732e7d7c04786600cb083117901dee793f3d38980754af00 + +build_options="avahi doc python" +build_options_default="avahi doc python" +desc_option_doc="Build documentation" + +libiio-devel_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove usr/lib/*.so + vmkdir usr/share/doc/libiio + mv ${DESTDIR}/usr/share/doc/libiio0-doc/v${version}/* \ + ${PKGDESTDIR}/usr/share/doc/libiio + } +} + +libiio-tools_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - utilities" + pkg_install() { + vmove usr/bin + } +} From 3d135534d47263eb12c4ed80f93985ad228dfc91 Mon Sep 17 00:00:00 2001 From: Evgeny Ermakov Date: Mon, 29 Nov 2021 00:53:30 +1100 Subject: [PATCH 2/2] gnuradio: update to 3.10.0.0. --- common/shlibs | 38 +++++++++++-------- ...6495f3bdf579dae0c26531a16f6adcc7fb2f.patch | 18 --------- ...15d0b26b3c72fab736bcd28a67ab9d1404b7.patch | 28 -------------- ...befbbe54e55fc4994899e92bcf5bf462fa2f.patch | 31 --------------- srcpkgs/gnuradio/template | 34 +++++++++++------ 5 files changed, 44 insertions(+), 105 deletions(-) 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 96ba87e335af..52f9f51df89a 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3240,22 +3240,28 @@ 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.10.0 gnuradio-3.10.0.0_1 +libgnuradio-pmt.so.3.10.0 gnuradio-3.10.0.0_1 +libgnuradio-blocks.so.3.10.0 gnuradio-3.10.0.0_1 +libgnuradio-audio.so.3.10.0 gnuradio-3.10.0.0_1 +libgnuradio-fec.so.3.10.0 gnuradio-3.10.0.0_1 +libgnuradio-fft.so.3.10.0 gnuradio-3.10.0.0_1 +libgnuradio-filter.so.3.10.0 gnuradio-3.10.0.0_1 +libgnuradio-analog.so.3.10.0 gnuradio-3.10.0.0_1 +libgnuradio-digital.so.3.10.0 gnuradio-3.10.0.0_1 +libgnuradio-dtv.so.3.10.0 gnuradio-3.10.0.0_1 +libgnuradio-channels.so.3.10.0 gnuradio-3.10.0.0_1 +libgnuradio-trellis.so.3.10.0 gnuradio-3.10.0.0_1 +libgnuradio-video-sdl.so.3.10.0 gnuradio-3.10.0.0_1 +libgnuradio-vocoder.so.3.10.0 gnuradio-3.10.0.0_1 +libgnuradio-wavelet.so.3.10.0 gnuradio-3.10.0.0_1 +libgnuradio-uhd.so.3.10.0 gnuradio-3.10.0.0_1 +libgnuradio-network.so.3.10.0 gnuradio-3.10.0.0_1 +libgnuradio-soapy.so.3.10.0 gnuradio-3.10.0.0_1 +libgnuradio-qtgui.so.3.10.0 gnuradio-3.10.0.0_1 +libgnuradio-zeromq.so.3.10.0 gnuradio-3.10.0.0_1 +libgnuradio-iio.so.3.10.0 gnuradio-3.10.0.0_1 +libgnuradio-pdu.so.3.10.0 gnuradio-3.10.0.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 index 51952bd29b38..676f631ebf5d 100644 --- a/srcpkgs/gnuradio/patches/596c6495f3bdf579dae0c26531a16f6adcc7fb2f.patch +++ b/srcpkgs/gnuradio/patches/596c6495f3bdf579dae0c26531a16f6adcc7fb2f.patch @@ -26,21 +26,3 @@ index 884bba7dd4b..44f616cdae1 100644 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 c49a047427e8..000000000000 --- 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 4faa3468140a..000000000000 --- 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 c950b53e8bea..8fa56e944b7e 100644 --- a/srcpkgs/gnuradio/template +++ b/srcpkgs/gnuradio/template @@ -1,28 +1,38 @@ # Template file for 'gnuradio' pkgname=gnuradio -version=3.8.0.0 -revision=9 +version=3.10.0.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 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" -depends="python3-cheetah3 python3-numpy python3-Mako python3-gobject - python3-yaml" -checkdepends="python3-scipy" +# -DGR_PYTHON_DIR=/${py3_sitelib} +configure_args="-DZEROMQ_INCLUDE_DIRS=${XBPS_CROSS_BASE}/usr/include + -Dpybind11_DIR=/${py3_sitelib}/pybind11/share/cmake/pybind11" +# TODO: add python3-pygccxml (not packaged in Void) +_pydeps="python3-Mako python3-cairo python3-click python3-click-plugins python3-gobject + python3-numpy python3-pyqtgraph python3-pyzmq python3-scipy python3-yaml" +hostmakedepends="pkg-config doxygen swig python3-Sphinx python3-pybind11 ${_pydeps} + texlive texlive-latexextra texlive-dvi" +makedepends="SDL-devel SoapySDR-devel boost-devel codec2-devel cppzmq fftw-devel gmpxx-devel + gsl-devel gtk+3-devel jack-devel libgsm-devel libiio-devel libsndfile-devel libsodium-devel + libusb-devel mpir-devel python3-devel python3-gobject-devel python3-pybind11 spdlog qwt-devel + uhd-devel volk-devel" +depends="${_pydeps} python3-cheetah3 python3-lxml python3-matplotlib" +checkdepends="python3-pytest" short_desc="Framework for software defined radio" 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=25535fb64d2541ec95325c3f901e2eb71ab794c5b53b9e97894d2d48bbd966da python_version=3 +if [ -n "$CROSS_BUILD" ]; then + hostmakedepends+=" qt5-host-tools qt5-qmake" +fi + post_install() { rm ${DESTDIR}/usr/share/gnuradio/examples/audio/dial_tone \ + ${DESTDIR}/usr/share/gnuradio/examples/qt-gui/display_qt \ ${DESTDIR}/usr/share/gnuradio/examples/uhd/tags_demo vinstall grc/scripts/freedesktop/gnuradio-grc.desktop 644 \ usr/share/applications