archlinuxarm/PKGBUILDs
1
0
Fork 0
mirror of https://github.com/archlinuxarm/PKGBUILDs.git synced 2025-01-27 23:44:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

removed community/gnuradio

Browse source
This commit is contained in:
Kevin Mihelich 2022-05-04 23:49:38 +00:00
parent a7d4c0ef64
commit 9da245df11
4 changed files with 0 additions and 901 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
community/gnuradio/21-fcd.rules
View file

@ -1,9 +0,0 @@
# Udev rules for the Funcube Dongle Pro (0xfb56) and Pro+ (0xfb31)
# HIDAPI/libusb:
SUBSYSTEMS=="usb" ATTRS{idVendor}=="04d8" ATTRS{idProduct}=="fb56" MODE:="0666"
SUBSYSTEMS=="usb" ATTRS{idVendor}=="04d8" ATTRS{idProduct}=="fb31" MODE:="0666"
# HIDAPI/hidraw:
KERNEL=="hidraw*", ATTRS{busnum}=="1", ATTRS{idVendor}=="04d8", ATTRS{idProduct}=="fb56", MODE="0666"
KERNEL=="hidraw*", ATTRS{busnum}=="1", ATTRS{idVendor}=="04d8", ATTRS{idProduct}=="fb31", MODE="0666"

139
community/gnuradio/PKGBUILD
View file

@ -1,139 +0,0 @@
# Maintainer: Kyle Keen <keenerd@gmail.com>
# Contributor: David Runge <dvzrv@archlinux.org>
# Contributor: Dominik Heidler <dheidler@gmail.com>
# Contributor: Jonatan Sastre <jsastreh [ at ] hotmail.com>
# remove when bumped upstream
pkgbase=gnuradio
pkgname=(gnuradio gnuradio-companion)
pkgver=3.9.4.0
pkgrel=2.1
pkgdesc="General purpose DSP and SDR toolkit. With drivers for usrp and fcd."
arch=('x86_64')
url="https://gnuradio.org"
license=('GPL')
depends=('python-numpy' 'gsl' 'blas' 'libuhd' 'libvolk' 'log4cpp' 'python-yaml'
'gmp' 'gsm' 'codec2' 'python-mako' 'python-click-plugins' 'soapysdr'
'pybind11')
makedepends=('alsa-lib' 'boost' 'cmake' 'fftw' 'glu' 'gtk3' 'jack' 'pango'
'portaudio' 'python-gobject' 'python-lxml' 'python-pyqt5' 'python-cairo'
'qwt' 'zeromq')
# todo
# split the gui components?
# build doxygen docs?
# gr-video-sdl ?
# icons
# add thrift?
# could soapy and pybind be optional makedeps?
# zeroc-ice: gr-ctrlport
# doxygen: C++ autogenerated documentation
# python-sphinx: Python autogenerated documentation
# secret release directory
#source=("http://s3-dist.gnuradio.org/gnuradio-$pkgver.tar.gz"
# neglected official release directory
#source=("https://gnuradio.org/releases/$pkgbase/$pkgbase-$pkgver.tar.gz"
# seems upstream stopped doing signed tags/release assets > 3.8.0.0 :-/
# https://github.com/gnuradio/gnuradio/issues/3858
source=("gnuradio-$pkgver.tgz::https://github.com/gnuradio/gnuradio/archive/refs/tags/v$pkgver.tar.gz"
#"https://github.com/gnuradio/gnuradio/releases/download/v$pkgver/gnuradio-$pkgver.tar.gz"
# "https://github.com/gnuradio/gnuradio/releases/download/v$pkgver/gnuradio-$pkgver.tar.gz.asc"
gnuradio-bind-placeholders.patch
gnuradio-qwt-6.2.patch
"21-fcd.rules")
validpgpkeys=('B90DDFAC56989BF62262EB812987C77CBB8ED9B2' # GNU Radio Project
'D74F9F146E7F755783583158B343B2BA293E5174') # Marcus Müller
sha512sums=('61c8a943f3cc0b33e4d4994b9e0bf5f79458bb21a2648fe6094dfb9b50edea7452f1bd35e6b1e566e331cf7fb4ea2a342d59bbd8798d5710d80eb037f427a183'
'f4e52e6e9ef6054f358d3ee00cbcb70bab65c36dfac8975c3182f6514c547905f36801a049f0918d69c9ffd98ce801891a3bfc4e4faeb8fb33582d84140a70b7'
'e169f3ac23930d4d42dabb96c3142dc254e7eb453e3e4bd3a96acdbccb1952e232447801e13eedad46874995a8f3c7ac1dc5abe79571b81f0715b70b593dbb98'
'6f02dc8e20a7a1cd11099c851a7c8427fcd21e9652e6cddd0a72ca747b0e93cd4fd1b7b7b7e426b6231348bcc34fb2417716a2f03c92ec141889edc65031c3a0')
prepare() {
cd "$srcdir/$pkgbase-$pkgver"
#patch -Np1 -i ../gnuradio-bind-placeholders.patch
patch -p1 -i ../gnuradio-qwt-6.2.patch # Fix build with qwt 6.2
sed -i -e "s|GR_PKG_LIBEXEC_DIR|GR_RUNTIME_DIR|" grc/scripts/freedesktop/CMakeLists.txt
#sed -i -e "s|/qwt$|/qwt5|" -e "s| qwt | qwt5 |" cmake/Modules/FindQwt.cmake
#sed -i -e "s| sphinx-build$| sphinx-build2|" cmake/Modules/FindSphinx.cmake
}
build() {
export PYTHON=python3
cd "$pkgbase-$pkgver"
cmake -DCMAKE_INSTALL_PREFIX=/usr \
-DPYTHON_EXECUTABLE=$(which python3) \
-DPYTHON_INCLUDE_DIR=/usr/include/python3.10 \
-DPYTHON_LIBRARY=/usr/lib/libpython3.10.so \
-DGR_PYTHON_DIR=/usr/lib/python3.10/site-packages \
-DENABLE_INTERNAL_VOLK=OFF \
-DENABLE_GRC=ON \
-DENABLE_GR_QTGUI=ON \
-DQWT_LIBRARIES=/usr/lib/libqwt.so \
-Wno-dev \
-B build \
-S .
make VERBOSE=1 -C build
}
check() {
cd "$pkgbase-$pkgver"
# TODO: investigate zeromq related test failures
# export PYTHON=python3
# make VERBOSE=1 test -C build
}
package_gnuradio() {
depends+=('libasound.so' 'libboost_filesystem.so'
'libboost_program_options.so' 'libboost_thread.so' 'libfftw3f.so'
'libfftw3f_threads.so' 'libjack.so' 'libportaudio.so' 'libzmq.so')
optdepends=('boost: gr_modtool'
'cmake: gr_modtool'
'pkgconfig: libuhd')
provides=(
'libgnuradio-zeromq.so'
'libgnuradio-wavelet.so'
'libgnuradio-vocoder.so'
'libgnuradio-uhd.so'
'libgnuradio-trellis.so'
'libgnuradio-runtime.so'
'libgnuradio-qtgui.so'
'libgnuradio-pmt.so'
'libgnuradio-filter.so'
'libgnuradio-fft.so'
'libgnuradio-fec.so'
'libgnuradio-dtv.so'
'libgnuradio-digital.so'
'libgnuradio-channels.so'
'libgnuradio-blocks.so'
'libgnuradio-audio.so'
'libgnuradio-analog.so'
)
cd "$pkgbase-$pkgver"
make DESTDIR="$pkgdir" install -C build
install -vDm 644 ../21-fcd.rules -t "$pkgdir/usr/lib/udev/rules.d/"
install -vDm 644 grc/scripts/freedesktop/gnuradio-grc.desktop \
-t "$pkgdir/usr/share/applications/"
}
package_gnuradio-companion() {
pkgdesc="GUI frontend for gnuradio and SDR."
depends=('gnuradio' 'qwt' 'python-lxml'
'python-opengl' 'python-cairo' 'python-gobject' 'python-pyqt5')
# Yup, nothing in the package except dependencies,
# because more than five optdeps is too many for most people.
}
# options for armv6:
# -Dhave_mfpu_neon=0 \
# -DCMAKE_CXX_FLAGS:STRING="-march=armv6 -mfpu=vfp -mfloat-abi=hard" \
# -DCMAKE_C_FLAGS:STRING="-march=armv6 -mfpu=vfp -mfloat-abi=hard" \
# options for armv7:
# -DCMAKE_CXX_FLAGS:STRING="-march=armv7-a -mcpu=cortex-a9 -mfpu=neon -mfloat-abi=hard"
# -DCMAKE_C_FLAGS:STRING="-march=armv7-a -mcpu=cortex-a9 -mfpu=neon -mfloat-abi=hard"
# line 341 add /usr/lib/arm-linux-gnueabihf /usr/lib/arm-linux-gnueabi

461
community/gnuradio/gnuradio-bind-placeholders.patch
View file

@ -1,461 +0,0 @@
--- gnuradio-3.8.1.0/gnuradio-runtime/lib/block.cc~ 2020-06-03 15:51:57.779451140 +0100
+++ gnuradio-3.8.1.0/gnuradio-runtime/lib/block.cc 2020-06-03 15:52:03.567451466 +0100
@@ -34,6 +34,8 @@
namespace gr {
+using namespace boost::placeholders;
+
block::block(const std::string& name,
io_signature::sptr input_signature,
io_signature::sptr output_signature)
--- gnuradio-3.8.1.0/gr-blocks/lib/copy_impl.cc~ 2020-06-03 16:48:48.001299713 +0100
+++ gnuradio-3.8.1.0/gr-blocks/lib/copy_impl.cc 2020-06-03 16:48:15.300285011 +0100
@@ -31,6 +31,8 @@
namespace gr {
namespace blocks {
+using namespace boost::placeholders;
+
copy::sptr copy::make(size_t itemsize)
{
return gnuradio::get_initial_sptr(new copy_impl(itemsize));
--- gnuradio-3.8.1.0/gr-blocks/lib/message_debug_impl.cc~ 2020-06-03 16:52:57.083411688 +0100
+++ gnuradio-3.8.1.0/gr-blocks/lib/message_debug_impl.cc 2020-06-03 16:52:59.468412760 +0100
@@ -32,6 +32,8 @@
namespace gr {
namespace blocks {
+using namespace boost::placeholders;
+
message_debug::sptr message_debug::make()
{
return gnuradio::get_initial_sptr(new message_debug_impl());
--- gnuradio-3.8.1.0/gr-blocks/lib/message_strobe_impl.cc~ 2020-06-03 16:53:34.139428345 +0100
+++ gnuradio-3.8.1.0/gr-blocks/lib/message_strobe_impl.cc 2020-06-03 16:53:35.651429024 +0100
@@ -38,6 +38,8 @@
namespace gr {
namespace blocks {
+using namespace boost::placeholders;
+
message_strobe::sptr message_strobe::make(pmt::pmt_t msg, long period_ms)
{
return gnuradio::get_initial_sptr(new message_strobe_impl(msg, period_ms));
--- gnuradio-3.8.1.0/gr-blocks/lib/message_strobe_random_impl.cc~ 2020-06-03 16:53:52.959436804 +0100
+++ gnuradio-3.8.1.0/gr-blocks/lib/message_strobe_random_impl.cc 2020-06-03 16:53:55.259437840 +0100
@@ -38,6 +38,8 @@
namespace gr {
namespace blocks {
+using namespace boost::placeholders;
+
message_strobe_random::sptr
message_strobe_random::make(pmt::pmt_t msg,
message_strobe_random_distribution_t dist,
--- gnuradio-3.8.1.0/gr-blocks/lib/multiply_matrix_impl.cc~ 2020-06-03 16:48:42.217297113 +0100
+++ gnuradio-3.8.1.0/gr-blocks/lib/multiply_matrix_impl.cc 2020-06-03 16:48:44.149297981 +0100
@@ -31,6 +31,8 @@
namespace gr {
namespace blocks {
+using namespace boost::placeholders;
+
// Copy tags from input k to output l if A[l][k] is not zero
template <>
void multiply_matrix_impl<gr_complex>::propagate_tags_by_A(int noutput_items,
--- gnuradio-3.8.1.0/gr-blocks/lib/mute_impl.cc~ 2020-06-03 16:44:53.010194065 +0100
+++ gnuradio-3.8.1.0/gr-blocks/lib/mute_impl.cc 2020-06-03 16:45:12.423202794 +0100
@@ -33,6 +33,8 @@
namespace gr {
namespace blocks {
+using namespace boost::placeholders;
+
template <class T>
typename mute_blk<T>::sptr mute_blk<T>::make(bool mute)
{
--- gnuradio-3.8.1.0/gr-blocks/lib/pdu_filter_impl.cc~ 2020-06-03 16:55:05.835454141 +0100
+++ gnuradio-3.8.1.0/gr-blocks/lib/pdu_filter_impl.cc 2020-06-03 16:55:08.074454516 +0100
@@ -31,6 +31,8 @@
namespace gr {
namespace blocks {
+using namespace boost::placeholders;
+
pdu_filter::sptr pdu_filter::make(pmt::pmt_t k, pmt::pmt_t v, bool invert)
{
return gnuradio::get_initial_sptr(new pdu_filter_impl(k, v, invert));
--- gnuradio-3.8.1.0/gr-blocks/lib/pdu_remove_impl.cc~ 2020-06-03 16:56:03.653466103 +0100
+++ gnuradio-3.8.1.0/gr-blocks/lib/pdu_remove_impl.cc 2020-06-03 16:56:05.132466450 +0100
@@ -31,6 +31,8 @@
namespace gr {
namespace blocks {
+using namespace boost::placeholders;
+
pdu_remove::sptr pdu_remove::make(pmt::pmt_t k)
{
return gnuradio::get_initial_sptr(new pdu_remove_impl(k));
--- gnuradio-3.8.1.0/gr-blocks/lib/pdu_set_impl.cc~ 2020-06-03 16:55:43.765461437 +0100
+++ gnuradio-3.8.1.0/gr-blocks/lib/pdu_set_impl.cc 2020-06-03 16:55:45.990461957 +0100
@@ -31,6 +31,8 @@
namespace gr {
namespace blocks {
+using namespace boost::placeholders;
+
pdu_set::sptr pdu_set::make(pmt::pmt_t k, pmt::pmt_t v)
{
return gnuradio::get_initial_sptr(new pdu_set_impl(k, v));
--- gnuradio-3.8.1.0/gr-blocks/lib/random_pdu_impl.cc~ 2020-06-03 16:56:32.885472969 +0100
+++ gnuradio-3.8.1.0/gr-blocks/lib/random_pdu_impl.cc 2020-06-03 16:56:34.848473430 +0100
@@ -31,6 +31,8 @@
namespace gr {
namespace blocks {
+using namespace boost::placeholders;
+
random_pdu::sptr
random_pdu::make(int min_items, int max_items, unsigned char byte_mask, int length_modulo)
{
--- gnuradio-3.8.1.0/gr-blocks/lib/repeat_impl.cc~ 2020-06-03 16:57:12.092482177 +0100
+++ gnuradio-3.8.1.0/gr-blocks/lib/repeat_impl.cc 2020-06-03 16:57:13.822482583 +0100
@@ -30,6 +30,8 @@
namespace gr {
namespace blocks {
+using namespace boost::placeholders;
+
repeat::sptr repeat::make(size_t itemsize, int interp)
{
return gnuradio::get_initial_sptr(new repeat_impl(itemsize, interp));
--- gnuradio-3.8.1.0/gr-zeromq/lib/push_msg_sink_impl.cc~ 2020-06-03 16:48:54.673302712 +0100
+++ gnuradio-3.8.1.0/gr-zeromq/lib/push_msg_sink_impl.cc 2020-06-03 16:47:55.975276324 +0100
@@ -31,6 +31,8 @@
namespace gr {
namespace zeromq {
+using namespace boost::placeholders;
+
push_msg_sink::sptr push_msg_sink::make(char* address, int timeout, bool bind)
{
return gnuradio::get_initial_sptr(new push_msg_sink_impl(address, timeout, bind));
--- gnuradio-3.8.1.0/gr-blocks/lib/socket_pdu_impl.cc~ 2020-06-03 17:20:39.245825015 +0100
+++ gnuradio-3.8.1.0/gr-blocks/lib/socket_pdu_impl.cc 2020-06-03 17:20:52.819828566 +0100
@@ -32,6 +32,8 @@
namespace gr {
namespace blocks {
+using namespace boost::placeholders;
+
socket_pdu::sptr socket_pdu::make(std::string type,
std::string addr,
std::string port,
--- gnuradio-3.8.1.0/gr-zeromq/lib/pub_msg_sink_impl.cc~ 2020-06-03 17:21:50.046843529 +0100
+++ gnuradio-3.8.1.0/gr-zeromq/lib/pub_msg_sink_impl.cc 2020-06-03 17:21:57.819845564 +0100
@@ -31,6 +31,8 @@
namespace gr {
namespace zeromq {
+using namespace boost::placeholders;
+
pub_msg_sink::sptr pub_msg_sink::make(char* address, int timeout, bool bind)
{
return gnuradio::get_initial_sptr(new pub_msg_sink_impl(address, timeout, bool));
--- gnuradio-3.8.1.0/gr-blocks/lib/tagged_stream_multiply_length_impl.cc~ 2020-06-03 17:35:50.436093636 +0100
+++ gnuradio-3.8.1.0/gr-blocks/lib/tagged_stream_multiply_length_impl.cc 2020-06-03 17:36:01.704097517 +0100
@@ -30,6 +30,8 @@
namespace gr {
namespace blocks {
+using namespace boost::placeholders;
+
tagged_stream_multiply_length::sptr tagged_stream_multiply_length::make(
size_t itemsize, const std::string& lengthtagname, double scalar)
{
--- gnuradio-3.8.1.0/gr-blocks/lib/tuntap_pdu_impl.cc~ 2020-06-03 17:46:10.583307228 +0100
+++ gnuradio-3.8.1.0/gr-blocks/lib/tuntap_pdu_impl.cc 2020-06-03 17:46:23.642311727 +0100
@@ -42,6 +42,8 @@
namespace gr {
namespace blocks {
+using namespace boost::placeholders;
+
tuntap_pdu::sptr tuntap_pdu::make(std::string dev, int MTU, bool istunflag)
{
#if (defined(linux) || defined(__linux) || defined(__linux__))
--- gnuradio-3.8.1.0/gr-fec/lib/async_encoder_impl.cc~ 2020-06-03 17:53:59.572468794 +0100
+++ gnuradio-3.8.1.0/gr-fec/lib/async_encoder_impl.cc 2020-06-03 17:54:10.438472537 +0100
@@ -32,6 +32,8 @@
namespace gr {
namespace fec {
+using namespace boost::placeholders;
+
async_encoder::sptr async_encoder::make(generic_encoder::sptr my_encoder,
bool packed,
bool rev_unpack,
--- gnuradio-3.8.1.0/gr-fec/lib/async_decoder_impl.cc~ 2020-06-03 17:54:23.920477182 +0100
+++ gnuradio-3.8.1.0/gr-fec/lib/async_decoder_impl.cc 2020-06-03 17:54:33.581480511 +0100
@@ -32,6 +32,8 @@
namespace gr {
namespace fec {
+using namespace boost::placeholders;
+
async_decoder::sptr
async_decoder::make(generic_decoder::sptr my_decoder, bool packed, bool rev_pack, int mtu)
{
--- gnuradio-3.8.1.0/gr-filter/lib/freq_xlating_fir_filter_impl.cc~ 2020-06-03 17:54:45.106484482 +0100
+++ gnuradio-3.8.1.0/gr-filter/lib/freq_xlating_fir_filter_impl.cc 2020-06-03 17:54:57.687488823 +0100
@@ -32,6 +32,8 @@
namespace gr {
namespace filter {
+using namespace boost::placeholders;
+
template <class IN_T, class OUT_T, class TAP_T>
typename freq_xlating_fir_filter<IN_T, OUT_T, TAP_T>::sptr
freq_xlating_fir_filter<IN_T, OUT_T, TAP_T>::make(int decimation,
--- gnuradio-3.8.1.0/gr-filter/lib/mmse_resampler_ff_impl.cc~ 2020-06-03 18:11:26.622789087 +0100
+++ gnuradio-3.8.1.0/gr-filter/lib/mmse_resampler_ff_impl.cc 2020-06-03 18:11:49.178794574 +0100
@@ -31,6 +31,8 @@
namespace gr {
namespace filter {
+using namespace boost::placeholders;
+
mmse_resampler_ff::sptr mmse_resampler_ff::make(float phase_shift, float resamp_ratio)
{
return gnuradio::get_initial_sptr(
--- gnuradio-3.8.1.0/gr-filter/lib/mmse_resampler_cc_impl.cc~ 2020-06-03 18:12:00.982797440 +0100
+++ gnuradio-3.8.1.0/gr-filter/lib/mmse_resampler_cc_impl.cc 2020-06-03 18:12:09.225799444 +0100
@@ -31,6 +31,8 @@
namespace gr {
namespace filter {
+using namespace boost::placeholders;
+
mmse_resampler_cc::sptr mmse_resampler_cc::make(float phase_shift, float resamp_ratio)
{
return gnuradio::get_initial_sptr(
--- gnuradio-3.8.1.0/gr-qtgui/lib/freq_sink_f_impl.cc~ 2020-06-03 18:33:55.755116400 +0100
+++ gnuradio-3.8.1.0/gr-qtgui/lib/freq_sink_f_impl.cc 2020-06-03 18:34:05.401118739 +0100
@@ -37,6 +37,7 @@
namespace gr {
namespace qtgui {
+using namespace boost::placeholders;
freq_sink_f::sptr freq_sink_f::make(int fftsize,
int wintype,
--- gnuradio-3.8.1.0/gr-qtgui/lib/freq_sink_c_impl.cc~ 2020-06-03 18:34:16.116121337 +0100
+++ gnuradio-3.8.1.0/gr-qtgui/lib/freq_sink_c_impl.cc 2020-06-03 18:34:26.130123766 +0100
@@ -38,6 +38,8 @@
namespace gr {
namespace qtgui {
+using namespace boost::placeholders;
+
freq_sink_c::sptr freq_sink_c::make(int fftsize,
int wintype,
double fc,
--- gnuradio-3.8.1.0/gr-qtgui/lib/time_raster_sink_f_impl.cc~ 2020-06-03 18:34:49.413129410 +0100
+++ gnuradio-3.8.1.0/gr-qtgui/lib/time_raster_sink_f_impl.cc 2020-06-03 18:35:00.258132040 +0100
@@ -36,6 +36,8 @@
namespace gr {
namespace qtgui {
+using namespace boost::placeholders;
+
time_raster_sink_f::sptr time_raster_sink_f::make(double samp_rate,
double rows,
double cols,
--- gnuradio-3.8.1.0/gr-qtgui/lib/time_raster_sink_b_impl.cc~ 2020-06-03 18:35:16.004135858 +0100
+++ gnuradio-3.8.1.0/gr-qtgui/lib/time_raster_sink_b_impl.cc 2020-06-03 18:35:28.818138965 +0100
@@ -36,6 +36,8 @@
namespace gr {
namespace qtgui {
+using namespace boost::placeholders;
+
time_raster_sink_b::sptr time_raster_sink_b::make(double samp_rate,
double rows,
double cols,
--- gnuradio-3.8.1.0/gr-qtgui/lib/time_sink_f_impl.cc~ 2020-06-03 18:35:46.982143370 +0100
+++ gnuradio-3.8.1.0/gr-qtgui/lib/time_sink_f_impl.cc 2020-06-03 18:35:58.555146176 +0100
@@ -40,6 +40,8 @@
namespace gr {
namespace qtgui {
+using namespace boost::placeholders;
+
time_sink_f::sptr time_sink_f::make(int size,
double samp_rate,
const std::string& name,
--- gnuradio-3.8.1.0/gr-qtgui/lib/time_sink_c_impl.cc~ 2020-06-03 18:36:10.189148997 +0100
+++ gnuradio-3.8.1.0/gr-qtgui/lib/time_sink_c_impl.cc 2020-06-03 18:36:21.394151714 +0100
@@ -39,6 +39,8 @@
namespace gr {
namespace qtgui {
+using namespace boost::placeholders;
+
time_sink_c::sptr time_sink_c::make(int size,
double samp_rate,
const std::string& name,
--- gnuradio-3.8.1.0/gr-qtgui/lib/sink_f_impl.cc~ 2020-06-03 18:36:31.583154184 +0100
+++ gnuradio-3.8.1.0/gr-qtgui/lib/sink_f_impl.cc 2020-06-03 18:36:41.626156620 +0100
@@ -36,6 +36,8 @@
namespace gr {
namespace qtgui {
+using namespace boost::placeholders;
+
sink_f::sptr sink_f::make(int fftsize,
int wintype,
double fc,
--- gnuradio-3.8.1.0/gr-qtgui/lib/sink_c_impl.cc~ 2020-06-03 18:36:54.167159661 +0100
+++ gnuradio-3.8.1.0/gr-qtgui/lib/sink_c_impl.cc 2020-06-03 18:37:04.898162263 +0100
@@ -36,6 +36,8 @@
namespace gr {
namespace qtgui {
+using namespace boost::placeholders;
+
sink_c::sptr sink_c::make(int fftsize,
int wintype,
double fc,
--- gnuradio-3.8.1.0/gr-analog/lib/sig_source_impl.cc~ 2020-06-03 18:37:26.774167567 +0100
+++ gnuradio-3.8.1.0/gr-analog/lib/sig_source_impl.cc 2020-06-03 18:37:38.170170330 +0100
@@ -36,6 +36,8 @@
namespace gr {
namespace analog {
+using namespace boost::placeholders;
+
template <class T>
typename sig_source<T>::sptr sig_source<T>::make(double sampling_freq,
gr_waveform_t waveform,
--- gnuradio-3.8.1.0/gr-digital/lib/chunks_to_symbols_impl.cc~ 2020-06-03 19:28:24.388506913 +0100
+++ gnuradio-3.8.1.0/gr-digital/lib/chunks_to_symbols_impl.cc 2020-06-03 19:28:36.713514932 +0100
@@ -32,6 +32,8 @@
namespace gr {
namespace digital {
+using namespace boost::placeholders;
+
template <class IN_T, class OUT_T>
typename chunks_to_symbols<IN_T, OUT_T>::sptr
chunks_to_symbols<IN_T, OUT_T>::make(const std::vector<OUT_T>& symbol_table, const int D)
--- gnuradio-3.8.1.0/gr-digital/lib/constellation_receiver_cb_impl.cc~ 2020-06-03 19:28:46.334521192 +0100
+++ gnuradio-3.8.1.0/gr-digital/lib/constellation_receiver_cb_impl.cc 2020-06-03 19:28:57.697528585 +0100
@@ -34,6 +34,8 @@
namespace gr {
namespace digital {
+using namespace boost::placeholders;
+
#define VERBOSE_MM 0 // Used for debugging symbol timing loop
#define VERBOSE_COSTAS 0 // Used for debugging phase and frequency tracking
--- gnuradio-3.8.1.0/gr-digital/lib/costas_loop_cc_impl.cc~ 2020-06-03 19:29:06.799534507 +0100
+++ gnuradio-3.8.1.0/gr-digital/lib/costas_loop_cc_impl.cc 2020-06-03 19:29:16.802541015 +0100
@@ -34,6 +34,8 @@
namespace gr {
namespace digital {
+using namespace boost::placeholders;
+
costas_loop_cc::sptr costas_loop_cc::make(float loop_bw, int order, bool use_snr)
{
return gnuradio::get_initial_sptr(new costas_loop_cc_impl(loop_bw, order, use_snr));
--- gnuradio-3.8.1.0/gr-qtgui/lib/const_sink_c_impl.cc~ 2020-06-03 19:29:29.694549403 +0100
+++ gnuradio-3.8.1.0/gr-qtgui/lib/const_sink_c_impl.cc 2020-06-03 19:29:38.089554865 +0100
@@ -35,6 +35,8 @@
namespace gr {
namespace qtgui {
+using namespace boost::placeholders;
+
const_sink_c::sptr
const_sink_c::make(int size, const std::string& name, int nconnections, QWidget* parent)
{
--- gnuradio-3.8.1.0/gr-digital/lib/crc32_async_bb_impl.cc~ 2020-06-03 19:29:48.487561630 +0100
+++ gnuradio-3.8.1.0/gr-digital/lib/crc32_async_bb_impl.cc 2020-06-03 19:30:02.250570584 +0100
@@ -31,6 +31,8 @@
namespace gr {
namespace digital {
+using namespace boost::placeholders;
+
crc32_async_bb::sptr crc32_async_bb::make(bool check)
{
return gnuradio::get_initial_sptr(new crc32_async_bb_impl(check));
--- gnuradio-3.8.1.0/gr-qtgui/lib/waterfall_sink_f_impl.cc~ 2020-06-03 19:30:17.822580714 +0100
+++ gnuradio-3.8.1.0/gr-qtgui/lib/waterfall_sink_f_impl.cc 2020-06-03 19:30:28.490587655 +0100
@@ -37,6 +37,8 @@
namespace gr {
namespace qtgui {
+using namespace boost::placeholders;
+
waterfall_sink_f::sptr waterfall_sink_f::make(int fftsize,
int wintype,
double fc,
--- gnuradio-3.8.1.0/gr-qtgui/lib/waterfall_sink_c_impl.cc~ 2020-06-03 19:32:58.390685182 +0100
+++ gnuradio-3.8.1.0/gr-qtgui/lib/waterfall_sink_c_impl.cc 2020-06-03 19:33:14.002695338 +0100
@@ -39,6 +39,8 @@
namespace gr {
namespace qtgui {
+using namespace boost::placeholders;
+
waterfall_sink_c::sptr waterfall_sink_c::make(int fftsize,
int wintype,
double fc,
--- gnuradio-3.8.1.0/gr-qtgui/lib/histogram_sink_f_impl.cc~ 2020-06-03 19:33:35.366709261 +0100
+++ gnuradio-3.8.1.0/gr-qtgui/lib/histogram_sink_f_impl.cc 2020-06-03 19:33:41.602713329 +0100
@@ -37,6 +37,8 @@
namespace gr {
namespace qtgui {
+using namespace boost::placeholders;
+
histogram_sink_f::sptr histogram_sink_f::make(int size,
int bins,
double xmin,
--- gnuradio-3.8.1.0/gr-qtgui/lib/edit_box_msg_impl.cc~ 2020-06-03 19:33:51.836719995 +0100
+++ gnuradio-3.8.1.0/gr-qtgui/lib/edit_box_msg_impl.cc 2020-06-03 19:34:00.055725357 +0100
@@ -35,6 +35,8 @@
namespace gr {
namespace qtgui {
+using namespace boost::placeholders;
+
edit_box_msg::sptr edit_box_msg::make(data_type_t type,
const std::string& label,
const std::string& value,
--- gnuradio-3.8.1.0/gr-digital/lib/header_payload_demux_impl.cc~ 2020-06-03 19:34:13.356734041 +0100
+++ gnuradio-3.8.1.0/gr-digital/lib/header_payload_demux_impl.cc 2020-06-03 19:34:20.622738782 +0100
@@ -31,6 +31,8 @@
namespace gr {
namespace digital {
+using namespace boost::placeholders;
+
const pmt::pmt_t header_payload_demux_impl::msg_port_id()
{
static const pmt::pmt_t msg_port_id = pmt::mp("header_data");
--- gnuradio-3.8.1.0/gr-digital/lib/protocol_formatter_async_impl.cc~ 2020-06-03 19:34:29.133744331 +0100
+++ gnuradio-3.8.1.0/gr-digital/lib/protocol_formatter_async_impl.cc 2020-06-03 19:34:34.557747861 +0100
@@ -32,6 +32,8 @@
namespace gr {
namespace digital {
+using namespace boost::placeholders;
+
protocol_formatter_async::sptr
protocol_formatter_async::make(const header_format_base::sptr& format)
{

292
community/gnuradio/gnuradio-qwt-6.2.patch
View file

@ -1,292 +0,0 @@
From e00ff78c9c2278cdf41e7197389cec707a30c672 Mon Sep 17 00:00:00 2001
From: Bill Muzika <bill.muzika@outlook.com>
Date: Fri, 3 Sep 2021 00:40:22 -0400
Subject: [PATCH] qt-gui: enables use of Qwt 6.2
Adds the typedefs and includes needed to build with Qwt 6.2.
Signed-off-by: Bill Muzika <bill.muzika@outlook.com>
---
gr-qtgui/include/gnuradio/qtgui/DisplayPlot.h | 5 ++++-
gr-qtgui/include/gnuradio/qtgui/TimeRasterDisplayPlot.h | 4 +++-
gr-qtgui/include/gnuradio/qtgui/WaterfallDisplayPlot.h | 4 +++-
gr-qtgui/include/gnuradio/qtgui/plot_raster.h | 6 ++++--
gr-qtgui/include/gnuradio/qtgui/plot_waterfall.h | 6 ++++--
gr-qtgui/include/gnuradio/qtgui/qtgui_types.h | 1 +
gr-qtgui/include/gnuradio/qtgui/timeRasterGlobalData.h | 9 +++++++--
gr-qtgui/include/gnuradio/qtgui/waterfallGlobalData.h | 9 +++++++--
gr-qtgui/lib/ConstellationDisplayPlot.cc | 1 +
gr-qtgui/lib/plot_raster.cc | 9 +++++++++
gr-qtgui/lib/plot_waterfall.cc | 9 +++++++++
gr-qtgui/lib/timeRasterGlobalData.cc | 7 +++++++
gr-qtgui/lib/waterfallGlobalData.cc | 6 ++++++
13 files changed, 65 insertions(+), 11 deletions(-)
diff --git a/gr-qtgui/include/gnuradio/qtgui/DisplayPlot.h b/gr-qtgui/include/gnuradio/qtgui/DisplayPlot.h
index 04de962fa3d..4e8afa26794 100644
--- a/gr-qtgui/include/gnuradio/qtgui/DisplayPlot.h
+++ b/gr-qtgui/include/gnuradio/qtgui/DisplayPlot.h
@@ -29,7 +29,10 @@
#include <vector>
#if QWT_VERSION >= 0x060000
-#include <qwt_compat.h>
+typedef QPointF QwtDoublePoint;
+typedef QRectF QwtDoubleRect;
+
+typedef QwtInterval QwtDoubleInterval;
#endif
typedef QList<QColor> QColorList;
diff --git a/gr-qtgui/include/gnuradio/qtgui/TimeRasterDisplayPlot.h b/gr-qtgui/include/gnuradio/qtgui/TimeRasterDisplayPlot.h
index 170b62cafbf..09bad218bee 100644
--- a/gr-qtgui/include/gnuradio/qtgui/TimeRasterDisplayPlot.h
+++ b/gr-qtgui/include/gnuradio/qtgui/TimeRasterDisplayPlot.h
@@ -23,7 +23,9 @@
#if QWT_VERSION < 0x060000
#include <gnuradio/qtgui/plot_waterfall.h>
#else
-#include <qwt_compat.h>
+#include <qwt_interval.h>
+
+typedef QwtInterval QwtDoubleInterval;
#endif
/*!
diff --git a/gr-qtgui/include/gnuradio/qtgui/WaterfallDisplayPlot.h b/gr-qtgui/include/gnuradio/qtgui/WaterfallDisplayPlot.h
index ed2196b63ef..afe7a6a6774 100644
--- a/gr-qtgui/include/gnuradio/qtgui/WaterfallDisplayPlot.h
+++ b/gr-qtgui/include/gnuradio/qtgui/WaterfallDisplayPlot.h
@@ -22,7 +22,9 @@
#if QWT_VERSION < 0x060000
#include <gnuradio/qtgui/plot_waterfall.h>
#else
-#include <qwt_compat.h>
+#include <qwt_interval.h>
+
+typedef QwtInterval QwtDoubleInterval;
#endif
/*!
diff --git a/gr-qtgui/include/gnuradio/qtgui/plot_raster.h b/gr-qtgui/include/gnuradio/qtgui/plot_raster.h
index dc7ee543872..4b4c4f2afb2 100644
--- a/gr-qtgui/include/gnuradio/qtgui/plot_raster.h
+++ b/gr-qtgui/include/gnuradio/qtgui/plot_raster.h
@@ -16,8 +16,10 @@
#include <qwt_plot_rasteritem.h>
#if QWT_VERSION >= 0x060000
-#include <qwt_compat.h>
-#include <qwt_point_3d.h> // doesn't seem necessary, but is...
+#include <qsize.h>
+#include <qwt_interval.h>
+
+typedef QwtInterval QwtDoubleInterval;
#endif
class QwtColorMap;
diff --git a/gr-qtgui/include/gnuradio/qtgui/plot_waterfall.h b/gr-qtgui/include/gnuradio/qtgui/plot_waterfall.h
index c3dba76bb95..f40446e25ca 100644
--- a/gr-qtgui/include/gnuradio/qtgui/plot_waterfall.h
+++ b/gr-qtgui/include/gnuradio/qtgui/plot_waterfall.h
@@ -16,8 +16,10 @@
#include <qwt_plot_rasteritem.h>
#if QWT_VERSION >= 0x060000
-#include <qwt_compat.h>
-#include <qwt_point_3d.h> // doesn't seem necessary, but is...
+#include <qsize.h>
+#include <qwt_interval.h>
+
+typedef QwtInterval QwtDoubleInterval;
#endif
class QwtColorMap;
diff --git a/gr-qtgui/include/gnuradio/qtgui/qtgui_types.h b/gr-qtgui/include/gnuradio/qtgui/qtgui_types.h
index e2735cf945d..670876afc7c 100644
--- a/gr-qtgui/include/gnuradio/qtgui/qtgui_types.h
+++ b/gr-qtgui/include/gnuradio/qtgui/qtgui_types.h
@@ -14,6 +14,7 @@
#include <gnuradio/high_res_timer.h>
#include <qwt_color_map.h>
#include <qwt_scale_draw.h>
+#include <qwt_text.h>
namespace gr {
namespace qtgui {
diff --git a/gr-qtgui/include/gnuradio/qtgui/timeRasterGlobalData.h b/gr-qtgui/include/gnuradio/qtgui/timeRasterGlobalData.h
index 09cd42883cd..5c743f4cad5 100644
--- a/gr-qtgui/include/gnuradio/qtgui/timeRasterGlobalData.h
+++ b/gr-qtgui/include/gnuradio/qtgui/timeRasterGlobalData.h
@@ -15,8 +15,9 @@
#include <cinttypes>
#if QWT_VERSION >= 0x060000
-#include <qwt_compat.h>
-#include <qwt_point_3d.h> // doesn't seem necessary, but is...
+#include <qwt_interval.h>
+
+typedef QwtInterval QwtDoubleInterval;
#endif
class TimeRasterData : public QwtRasterData
@@ -35,6 +36,9 @@ class TimeRasterData : public QwtRasterData
#if QWT_VERSION < 0x060000
virtual QwtDoubleInterval range() const;
virtual void setRange(const QwtDoubleInterval&);
+#else
+ virtual QwtInterval interval(Qt::Axis) const;
+ void setInterval(Qt::Axis, const QwtInterval&);
#endif
double value(double x, double y) const override;
@@ -56,6 +60,7 @@ class TimeRasterData : public QwtRasterData
QwtDoubleInterval d_intensityRange;
#else
QwtInterval d_intensityRange;
+ QwtInterval d_intervals[3];
#endif
private:
diff --git a/gr-qtgui/include/gnuradio/qtgui/waterfallGlobalData.h b/gr-qtgui/include/gnuradio/qtgui/waterfallGlobalData.h
index 03d9d13dc6a..9895e658c62 100644
--- a/gr-qtgui/include/gnuradio/qtgui/waterfallGlobalData.h
+++ b/gr-qtgui/include/gnuradio/qtgui/waterfallGlobalData.h
@@ -15,8 +15,9 @@
#include <cinttypes>
#if QWT_VERSION >= 0x060000
-#include <qwt_compat.h>
-#include <qwt_point_3d.h> // doesn't seem necessary, but is...
+#include <qwt_interval.h>
+
+typedef QwtInterval QwtDoubleInterval;
#endif
class WaterfallData : public QwtRasterData
@@ -36,6 +37,9 @@ class WaterfallData : public QwtRasterData
#if QWT_VERSION < 0x060000
virtual QwtDoubleInterval range() const;
virtual void setRange(const QwtDoubleInterval&);
+#else
+ virtual QwtInterval interval(Qt::Axis) const;
+ void setInterval(Qt::Axis, const QwtInterval&);
#endif
double value(double x, double y) const override;
@@ -60,6 +64,7 @@ class WaterfallData : public QwtRasterData
QwtDoubleInterval _intensityRange;
#else
QwtInterval _intensityRange;
+ QwtInterval d_intervals[3];
#endif
private:
diff --git a/gr-qtgui/lib/ConstellationDisplayPlot.cc b/gr-qtgui/lib/ConstellationDisplayPlot.cc
index ffd3ecf5943..4283fad40f9 100644
--- a/gr-qtgui/lib/ConstellationDisplayPlot.cc
+++ b/gr-qtgui/lib/ConstellationDisplayPlot.cc
@@ -16,6 +16,7 @@
#include <qwt_legend.h>
#include <qwt_scale_draw.h>
#include <QColor>
+#include <cmath>
class ConstellationDisplayZoomer : public QwtPlotZoomer
{
diff --git a/gr-qtgui/lib/plot_raster.cc b/gr-qtgui/lib/plot_raster.cc
index 7bb439881a4..d79def0f44a 100644
--- a/gr-qtgui/lib/plot_raster.cc
+++ b/gr-qtgui/lib/plot_raster.cc
@@ -244,7 +244,11 @@ QImage PlotTimeRaster::renderImage(const QwtScaleMap& xMap,
}
d_data->data->incrementResidual();
} else if (d_data->colorMap->format() == QwtColorMap::Indexed) {
+#if QWT_VERSION >= 0x060200
+ image.setColorTable(d_data->colorMap->colorTable(256));
+#else
image.setColorTable(d_data->colorMap->colorTable(intensityRange));
+#endif
for (int y = rect.top(); y <= rect.bottom(); y++) {
const double ty = yyMap.invTransform(y);
@@ -253,8 +257,13 @@ QImage PlotTimeRaster::renderImage(const QwtScaleMap& xMap,
for (int x = rect.left(); x <= rect.right(); x++) {
const double tx = xxMap.invTransform(x);
+#if QWT_VERSION >= 0x060200
+ *line++ = d_data->colorMap->colorIndex(
+ 256, intensityRange, d_data->data->value(tx, ty));
+#else
*line++ = d_data->colorMap->colorIndex(intensityRange,
d_data->data->value(tx, ty));
+#endif
}
}
}
diff --git a/gr-qtgui/lib/plot_waterfall.cc b/gr-qtgui/lib/plot_waterfall.cc
index ff47ea20032..94c44051d6d 100644
--- a/gr-qtgui/lib/plot_waterfall.cc
+++ b/gr-qtgui/lib/plot_waterfall.cc
@@ -240,7 +240,11 @@ QImage PlotWaterfall::renderImage(const QwtScaleMap& xMap,
}
}
} else if (d_data->colorMap->format() == QwtColorMap::Indexed) {
+#if QWT_VERSION >= 0x060200
+ image.setColorTable(d_data->colorMap->colorTable(256));
+#else
image.setColorTable(d_data->colorMap->colorTable(intensityRange));
+#endif
for (int y = rect.top(); y <= rect.bottom(); y++) {
const double ty = yyMap.invTransform(y);
@@ -249,8 +253,13 @@ QImage PlotWaterfall::renderImage(const QwtScaleMap& xMap,
for (int x = rect.left(); x <= rect.right(); x++) {
const double tx = xxMap.invTransform(x);
+#if QWT_VERSION >= 0x060200
+ *line++ = d_data->colorMap->colorIndex(
+ 256, intensityRange, d_data->data->value(tx, ty));
+#else
*line++ = d_data->colorMap->colorIndex(intensityRange,
d_data->data->value(tx, ty));
+#endif
}
}
}
diff --git a/gr-qtgui/lib/timeRasterGlobalData.cc b/gr-qtgui/lib/timeRasterGlobalData.cc
index 1b9e7a0332d..4ec028ffb3a 100644
--- a/gr-qtgui/lib/timeRasterGlobalData.cc
+++ b/gr-qtgui/lib/timeRasterGlobalData.cc
@@ -132,6 +132,13 @@ void TimeRasterData::setRange(const QwtDoubleInterval& newRange)
{
d_intensityRange = newRange;
}
+#else
+void TimeRasterData::setInterval(Qt::Axis axis, const QwtInterval& interval)
+{
+ d_intervals[axis] = interval;
+}
+
+QwtInterval TimeRasterData::interval(Qt::Axis a) const { return d_intervals[a]; }
#endif
diff --git a/gr-qtgui/lib/waterfallGlobalData.cc b/gr-qtgui/lib/waterfallGlobalData.cc
index 4c703310475..38c955f2ee7 100644
--- a/gr-qtgui/lib/waterfallGlobalData.cc
+++ b/gr-qtgui/lib/waterfallGlobalData.cc
@@ -139,7 +139,13 @@ void WaterfallData::setRange(const QwtDoubleInterval& newRange)
{
_intensityRange = newRange;
}
+#else
+void WaterfallData::setInterval(Qt::Axis axis, const QwtInterval& interval)
+{
+ d_intervals[axis] = interval;
+}
+QwtInterval WaterfallData::interval(Qt::Axis a) const { return d_intervals[a]; }
#endif