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

gnuradio: update to 3.8.0.0.

Browse source 
[skip ci]
This commit is contained in:
bra1nwave 2020-02-01 20:51:04 +01:00 committed by Piraty
parent fcf8581a86
commit 9d23fd2250
3 changed files with 27 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
common/shlibs
View file

@ -3165,27 +3165,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.1.4 volk-1.4_1
libgnuradio-runtime-3.7.13.5.so.0.0.0 gnuradio-3.7.13.5_1
libgnuradio-pmt-3.7.13.5.so.0.0.0 gnuradio-3.7.13.5_1
libgnuradio-blocks-3.7.13.5.so.0.0.0 gnuradio-3.7.13.5_1
libgnuradio-audio-3.7.13.5.so.0.0.0 gnuradio-3.7.13.5_1
libgnuradio-noaa-3.7.13.5.so.0.0.0 gnuradio-3.7.13.5_1
libgnuradio-fec-3.7.13.5.so.0.0.0 gnuradio-3.7.13.5_1
libgnuradio-fft-3.7.13.5.so.0.0.0 gnuradio-3.7.13.5_1
libgnuradio-filter-3.7.13.5.so.0.0.0 gnuradio-3.7.13.5_1
libgnuradio-analog-3.7.13.5.so.0.0.0 gnuradio-3.7.13.5_1
libgnuradio-digital-3.7.13.5.so.0.0.0 gnuradio-3.7.13.5_1
libgnuradio-dtv-3.7.13.5.so.0.0.0 gnuradio-3.7.13.5_1
libgnuradio-atsc-3.7.13.5.so.0.0.0 gnuradio-3.7.13.5_1
libgnuradio-channels-3.7.13.5.so.0.0.0 gnuradio-3.7.13.5_1
libgnuradio-pager-3.7.13.5.so.0.0.0 gnuradio-3.7.13.5_1
libgnuradio-trellis-3.7.13.5.so.0.0.0 gnuradio-3.7.13.5_1
libgnuradio-video-sdl-3.7.13.5.so.0.0.0 gnuradio-3.7.13.5_1
libgnuradio-vocoder-3.7.13.5.so.0.0.0 gnuradio-3.7.13.5_1
libgnuradio-fcd-3.7.13.5.so.0.0.0 gnuradio-3.7.13.5_1
libgnuradio-wavelet-3.7.13.5.so.0.0.0 gnuradio-3.7.13.5_1
libgnuradio-wxgui-3.7.13.5.so.0.0.0 gnuradio-3.7.13.5_1
libgnuradio-uhd-3.7.13.5.so.0.0.0 gnuradio-3.7.13.5_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-osmosdr-0.1.4.so.0.0.0 gnuradio-osmosdr-0.1.4_1
libflann_cpp.so.1.9 flann-1.9.1_1
libflann.so.1.9 flann-1.9.1_1

36
srcpkgs/gnuradio/patches/c01473bf00b73ba1dd72813fbc4c4c5d0f66d339.patch
View file

@ -1,36 +0,0 @@
From c01473bf00b73ba1dd72813fbc4c4c5d0f66d339 Mon Sep 17 00:00:00 2001
From: Michael Dickens <michael.dickens@ettus.com>
Date: Thu, 23 May 2019 10:26:00 -0400
Subject: [PATCH] blocks: simple fix for Boost 1.70.0 in socket_pdu
NOTE: There have been multiple fixes proposed, such as
https://github.com/gnuradio/gnuradio/pull/2451 .
This one is the simplest and most compatible.
---
gr-blocks/lib/socket_pdu_impl.cc | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git gr-blocks/lib/socket_pdu_impl.cc gr-blocks/lib/socket_pdu_impl.cc
index e20f1478f0..168d74ebb2 100644
--- gr-blocks/lib/socket_pdu_impl.cc
+++ gr-blocks/lib/socket_pdu_impl.cc
@@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
- * Copyright 2013 Free Software Foundation, Inc.
+ * Copyright 2013,2019 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -165,7 +165,11 @@ namespace gr {
void
socket_pdu_impl::start_tcp_accept()
{
+#if (BOOST_VERSION >= 107000)
+ tcp_connection::sptr new_connection = tcp_connection::make(d_io_service, d_rxbuf.size(), d_tcp_no_delay);
+#else
tcp_connection::sptr new_connection = tcp_connection::make(d_acceptor_tcp->get_io_service(), d_rxbuf.size(), d_tcp_no_delay);
+#endif
d_acceptor_tcp->async_accept(new_connection->socket(),
boost::bind(&socket_pdu_impl::handle_tcp_accept, this,

27
srcpkgs/gnuradio/template
View file

@ -1,31 +1,26 @@
# Template file for 'gnuradio'
pkgname=gnuradio
version=3.7.13.5
revision=3
version=3.8.0.0
revision=1
build_style=cmake
nocross="relies on volk, which is not complete for arm"
conf_files="/etc/gnuradio/conf.d/*"
configure_args="-DENABLE_INTERNAL_VOLK=OFF"
pycompile_module="gnuradio grc_gnuradio pmt"
hostmakedepends="pkg-config doxygen swig python-cheetah python-lxml
python-numpy python-Sphinx"
makedepends="SDL-devel boost-devel fftw-devel gsl-devel jack-devel libgsm-devel
libusb-devel pygtk-devel volk-devel wxPython-devel uhd-devel python-devel"
depends="pygtk python-cheetah python-lxml python-numpy"
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
python3-gobject-devel log4cpp-devel gmpxx-devel mpir-devel"
depends="python3-cheetah3 python3-numpy python3-Mako python3-gobject
python3-yaml"
short_desc="Framework for software defined radio"
maintainer="Andrew Benson <abenson+void@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://www.gnuradio.org"
distfiles="https://github.com/gnuradio/gnuradio/archive/v${version}.tar.gz"
checksum=9afcd0e4499160bce17c8c5c100f461791ad26b4bcb967d956fb9567e74dd57f
if [ "$CROSS_BUILD" ]; then
nocross="https://build.voidlinux.org/builders/armv7l_builder/builds/7596/steps/shell_3/logs/stdio"
fi
checksum=03fd01f0b27033befb91709b3d56f95e0869b5fb8bc71bec2662266a3f0dedf5
post_install() {
rm ${DESTDIR}/usr/share/gnuradio/examples/audio/dial_tone \
${DESTDIR}/usr/share/gnuradio/examples/fcd/fcd_nfm_rx \
${DESTDIR}/usr/share/gnuradio/examples/uhd/tags_demo
vinstall grc/scripts/freedesktop/gnuradio-grc.desktop 644 \
usr/share/applications