mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-18 19:49:40 +00:00
Code Issues Releases Activity

Un-break comms/gr-osmosdr and comms/gqrx following Gnuradio 3.8 update

Browse Source 
For both projects, building with Gnuradio 3.8 is not yet officially supported
so we use local patches at the moment.

See *gr38* patch headers for more details.
This commit is contained in:
Ganael LAPLANCHE 2019-08-21 20:43:23 +00:00
parent b3384d240a
commit 3cbcdc57ee
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=509562
9 changed files with 8546 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
comms/gqrx/Makefile
View File

@ -4,7 +4,7 @@
PORTNAME= gqrx
PORTVERSION= 2.11.5
DISTVERSIONPREFIX= v
PORTREVISION= 10
PORTREVISION= 11
PORTEPOCH= 1
CATEGORIES= comms hamradio
@ -14,9 +14,6 @@ COMMENT= Software defined radio receiver powered by GNU Radio and Qt
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING
DEPRECATED= Depends on expiring comms/gr-osmosdr
EXPIRATION_DATE= 2019-09-04
LIB_DEPENDS= libgnuradio-runtime.so:comms/gnuradio \
libgnuradio-analog.so:comms/gnuradio \
libgnuradio-blocks.so:comms/gnuradio \
@ -27,7 +24,9 @@ LIB_DEPENDS= libgnuradio-runtime.so:comms/gnuradio \
libgnuradio-osmosdr.so:comms/gr-osmosdr \
libboost_system.so:devel/boost-libs \
libboost_program_options.so:devel/boost-libs \
liblog4cpp.so:devel/log4cpp
liblog4cpp.so:devel/log4cpp \
libgmpxx.so:math/gmp \
libgmp.so:math/gmp
USES= gl pkgconfig qmake qt:5

145
comms/gqrx/files/patch-00-gr38-compat.txt Normal file
View File

@ -0,0 +1,145 @@
Gnuradio 3.8 compatibility patch from:
https://github.com/csete/gqrx/pull/696
https://github.com/csete/gqrx/commit/2cc48cb8c9e71f893b04a70ff4ad3e9ee3b49b3e.diff
diff --git a/src/applications/gqrx/receiver.cpp b/src/applications/gqrx/receiver.cpp
index 361be52c..1a364521 100644
--- src/applications/gqrx/receiver.cpp.orig
+++ src/applications/gqrx/receiver.cpp
@@ -28,7 +28,7 @@
#include <iostream>
-#include <gnuradio/blocks/multiply_const_ff.h>
+#include <gnuradio/blocks/multiply_const.h>
#include <gnuradio/prefs.h>
#include <gnuradio/top_block.h>
#include <osmosdr/source.h>
diff --git a/src/applications/gqrx/receiver.h b/src/applications/gqrx/receiver.h
index f86d741d..2b2c7f17 100644
--- src/applications/gqrx/receiver.h.orig
+++ src/applications/gqrx/receiver.h
@@ -23,10 +23,10 @@
#ifndef RECEIVER_H
#define RECEIVER_H
-#include <gnuradio/analog/sig_source_c.h>
+#include <gnuradio/analog/sig_source.h>
#include <gnuradio/blocks/file_sink.h>
-#include <gnuradio/blocks/multiply_const_ff.h>
-#include <gnuradio/blocks/multiply_cc.h>
+#include <gnuradio/blocks/multiply_const.h>
+#include <gnuradio/blocks/multiply.h>
#include <gnuradio/blocks/null_sink.h>
#include <gnuradio/blocks/wavfile_sink.h>
#include <gnuradio/blocks/wavfile_source.h>
diff --git a/src/dsp/correct_iq_cc.h b/src/dsp/correct_iq_cc.h
index cb033782..1fe96878 100644
--- src/dsp/correct_iq_cc.h.orig
+++ src/dsp/correct_iq_cc.h
@@ -28,7 +28,7 @@
#include <gnuradio/blocks/float_to_complex.h>
#include <gnuradio/hier_block2.h>
#include <gnuradio/filter/single_pole_iir_filter_cc.h>
-#include <gnuradio/blocks/sub_cc.h>
+#include <gnuradio/blocks/sub.h>
class dc_corr_cc;
class iq_swap_cc;
diff --git a/src/dsp/filter/fir_decim.cpp b/src/dsp/filter/fir_decim.cpp
index af2ebda7..7ee3e1b2 100644
--- src/dsp/filter/fir_decim.cpp.orig
+++ src/dsp/filter/fir_decim.cpp
@@ -24,7 +24,7 @@
#include <cstdio>
#include <vector>
-#include <gnuradio/filter/fir_filter_ccf.h>
+#include <gnuradio/filter/fir_filter.h>
#include <gnuradio/hier_block2.h>
#include <gnuradio/io_signature.h>
diff --git a/src/dsp/filter/fir_decim.h b/src/dsp/filter/fir_decim.h
index 9c026f48..bd1f09f2 100644
--- src/dsp/filter/fir_decim.h.orig
+++ src/dsp/filter/fir_decim.h
@@ -22,7 +22,7 @@
*/
#pragma once
-#include <gnuradio/filter/fir_filter_ccf.h>
+#include <gnuradio/filter/fir_filter_blk.h>
#include <gnuradio/hier_block2.h>
class fir_decim_cc;
diff --git a/src/dsp/lpf.h b/src/dsp/lpf.h
index 049b3a9c..6663fdc2 100644
--- src/dsp/lpf.h.orig
+++ src/dsp/lpf.h
@@ -25,7 +25,7 @@
#include <gnuradio/hier_block2.h>
#include <gnuradio/filter/firdes.h>
-#include <gnuradio/filter/fir_filter_fff.h>
+#include <gnuradio/filter/fir_filter_blk.h>
class lpf_ff;
diff --git a/src/dsp/rx_filter.h b/src/dsp/rx_filter.h
index 8723be32..d1b1db61 100644
--- src/dsp/rx_filter.h.orig
+++ src/dsp/rx_filter.h
@@ -24,8 +24,8 @@
#define RX_FILTER_H
#include <gnuradio/hier_block2.h>
-#include <gnuradio/filter/fir_filter_ccc.h>
-#include <gnuradio/filter/freq_xlating_fir_filter_ccc.h>
+#include <gnuradio/filter/fir_filter_blk.h>
+#include <gnuradio/filter/freq_xlating_fir_filter.h>
#define RX_FILTER_MIN_WIDTH 100 /*! Minimum width of filter */
diff --git a/src/dsp/rx_rds.h b/src/dsp/rx_rds.h
index 17e406ae..098b20ef 100644
--- src/dsp/rx_rds.h.orig
+++ src/dsp/rx_rds.h
@@ -24,11 +24,9 @@
#define RX_RDS_H
#include <gnuradio/hier_block2.h>
-#include <gnuradio/filter/fir_filter_ccc.h>
-#include <gnuradio/filter/fir_filter_ccf.h>
-#include <gnuradio/filter/fir_filter_fff.h>
-#include <gnuradio/filter/freq_xlating_fir_filter_fcf.h>
-#include <gnuradio/filter/freq_xlating_fir_filter_ccf.h>
+#include <gnuradio/filter/fir_filter.h>
+#include <gnuradio/filter/fir_filter_blk.h>
+#include <gnuradio/filter/freq_xlating_fir_filter.h>
#include <gnuradio/digital/constellation_receiver_cb.h>
#include <gnuradio/blocks/keep_one_in_n.h>
#include <gnuradio/digital/diff_decoder_bb.h>
diff --git a/src/dsp/stereo_demod.h b/src/dsp/stereo_demod.h
index 28be5c0c..d88e0890 100644
--- src/dsp/stereo_demod.h.orig
+++ src/dsp/stereo_demod.h
@@ -26,14 +26,13 @@
#include <gnuradio/hier_block2.h>
#include <gnuradio/filter/firdes.h>
-#include <gnuradio/filter/fir_filter_fcc.h>
-#include <gnuradio/filter/fir_filter_fff.h>
+#include <gnuradio/filter/fir_filter.h>
+#include <gnuradio/filter/fir_filter_blk.h>
#include <gnuradio/analog/pll_refout_cc.h>
-#include <gnuradio/blocks/multiply_cc.h>
-#include <gnuradio/blocks/multiply_ff.h>
-#include <gnuradio/blocks/multiply_const_ff.h>
+#include <gnuradio/blocks/multiply.h>
+#include <gnuradio/blocks/multiply_const.h>
#include <gnuradio/blocks/complex_to_imag.h>
-#include <gnuradio/blocks/add_ff.h>
+#include <gnuradio/blocks/add_blk.h>
#include <vector>
#include "dsp/lpf.h"
#include "dsp/resampler_xx.h"

7
comms/gqrx/files/patch-gqrx.pro
View File

@ -1,10 +1,11 @@
--- ./gqrx.pro.orig 2014-08-08 08:21:20.000000000 -0500
+++ ./gqrx.pro 2014-09-05 22:50:58.000000000 -0500
@@ -206,7 +206,6 @@
--- gqrx.pro.orig 2018-05-16 23:32:13.000000000 +0200
+++ gqrx.pro 2019-08-20 22:57:38.783794000 +0200
@@ -267,7 +267,7 @@
unix:!macx {
LIBS += -lboost_system$$BOOST_SUFFIX -lboost_program_options$$BOOST_SUFFIX
- LIBS += -lrt # need to include on some distros
+ LIBS += -llog4cpp
}
macx {

16
comms/gr-osmosdr/Makefile
View File

@ -2,9 +2,8 @@
PORTNAME= gr-osmosdr
DISTVERSIONPREFIX= v
DISTVERSION= 0.1.4-99
DISTVERSIONSUFFIX= -gc98be5d
PORTREVISION= 9
DISTVERSION= 0.1.4-127
DISTVERSIONSUFFIX= -g4d83c60
PORTEPOCH= 1
CATEGORIES= comms hamradio
@ -13,17 +12,17 @@ COMMENT= GNU Radio OsmoSDR module
LICENSE= GPLv3
BROKEN= does not build with Gnuradio 3.8
DEPRECATED= Broken for more than 6 months
EXPIRATION_DATE= 2019-09-04
BUILD_DEPENDS= swig3.0:devel/swig30 \
cheetah:devel/py-cheetah
LIB_DEPENDS= libgnuradio-runtime.so:comms/gnuradio \
libgnuradio-pmt.so:comms/gnuradio \
libgnuradio-blocks.so:comms/gnuradio \
libboost_system.so:devel/boost-libs \
libboost_thread.so:devel/boost-libs
libboost_thread.so:devel/boost-libs \
liblog4cpp.so:devel/log4cpp \
libgmpxx.so:math/gmp \
libgmp.so:math/gmp \
liborc-0.4.so:devel/orc
USES= cmake compiler:c++11-lang fortran pkgconfig python:2.7 tar:tgz
@ -35,7 +34,6 @@ BINARY_ALIAS= swig=swig3.0
# See lib/CMakeLists.txt to enable more components
CMAKE_ARGS+= -DENABLE_DEFAULT:BOOL=OFF \
-DENABLE_FCD:BOOL=ON \
-DENABLE_FILE:BOOL=ON \
-DENABLE_PYTHON=ON \
-DPYTHON_EXECUTABLE:STRING="${PYTHON_CMD}"

6
comms/gr-osmosdr/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1530557606
SHA256 (osmocom-gr-osmosdr-v0.1.4-99-gc98be5d_GH0.tar.gz) = d18f86265cf90aaa7e009dce3a41f2d752a1df5561cb453078a61ab2a4669d53
SIZE (osmocom-gr-osmosdr-v0.1.4-99-gc98be5d_GH0.tar.gz) = 272154
TIMESTAMP = 1565587646
SHA256 (osmocom-gr-osmosdr-v0.1.4-127-g4d83c60_GH0.tar.gz) = 9f363b33b4c3eb5f3ba04b7cb3b7d3b5a51d615c595b10e6e7b985cfc4076ca6
SIZE (osmocom-gr-osmosdr-v0.1.4-127-g4d83c60_GH0.tar.gz) = 278385

8349
comms/gr-osmosdr/files/patch-00-gr38-compat.txt Normal file
View File

File diff suppressed because it is too large Load Diff

22
comms/gr-osmosdr/files/patch-01-gr38-blocks-fix.txt Normal file
View File

@ -0,0 +1,22 @@
Additional patch to patch-00-gr38-compat.txt to fix gnuradio-blocks detection
--- lib/CMakeLists.txt.orig 2019-08-21 21:52:33.498102000 +0200
+++ lib/CMakeLists.txt 2019-08-21 21:52:10.455846000 +0200
@@ -137,7 +137,7 @@
########################################################################
# Setup File component
########################################################################
-GR_REGISTER_COMPONENT("IQ File Source & Sink" ENABLE_FILE GNURADIO_BLOCKS_FOUND)
+GR_REGISTER_COMPONENT("IQ File Source & Sink" ENABLE_FILE gnuradio-blocks_FOUND)
if(ENABLE_FILE)
GR_INCLUDE_SUBDIRECTORY(file)
endif(ENABLE_FILE)
@@ -153,7 +153,7 @@
########################################################################
# Setup RTL_TCP component
########################################################################
-GR_REGISTER_COMPONENT("RTLSDR TCP Client" ENABLE_RTL_TCP GNURADIO_BLOCKS_FOUND)
+GR_REGISTER_COMPONENT("RTLSDR TCP Client" ENABLE_RTL_TCP gnuradio-blocks_FOUND)
if(ENABLE_RTL_TCP)
GR_INCLUDE_SUBDIRECTORY(rtl_tcp)
endif(ENABLE_RTL_TCP)

16
comms/gr-osmosdr/files/patch-CMakeLists.txt
View File

@ -1,19 +1,19 @@
--- CMakeLists.txt.orig 2012-11-07 18:06:30.000000000 -0500
+++ CMakeLists.txt 2012-11-07 18:07:40.000000000 -0500
@@ -93,6 +93,7 @@
include(GrPlatform) #define LIB_SUFFIX
--- CMakeLists.txt.orig 2019-08-13 21:56:30.210296000 +0200
+++ CMakeLists.txt 2019-08-13 21:58:36.690159000 +0200
@@ -129,6 +129,7 @@
set(GR_CMAKE_DIR ${CMAKE_MODULES_DIR}/osmosdr)
set(GR_RUNTIME_DIR bin)
set(GR_LIBRARY_DIR lib${LIB_SUFFIX})
+set(GR_LIBDATA_DIR libdata)
set(GR_INCLUDE_DIR include)
set(GR_DATA_DIR share)
set(GR_PKG_DATA_DIR ${GR_DATA_DIR}/${CMAKE_PROJECT_NAME})
@@ -197,7 +198,7 @@
@@ -339,7 +340,7 @@
INSTALL(
FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-osmosdr.pc
- DESTINATION ${GR_LIBRARY_DIR}/pkgconfig
+ DESTINATION ${GR_LIBDATA_DIR}/pkgconfig
FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-osmosdr.pc
- DESTINATION ${GR_LIBRARY_DIR}/pkgconfig
+ DESTINATION ${GR_LIBDATA_DIR}/pkgconfig
)
########################################################################

8
comms/gr-osmosdr/pkg-plist
View File

@ -11,8 +11,8 @@ include/osmosdr/source.h
include/osmosdr/swig/osmosdr_swig.i
include/osmosdr/swig/osmosdr_swig_doc.i
include/osmosdr/time_spec.h
lib/cmake/osmosdr/osmosdrConfig.cmake
lib/libgnuradio-osmosdr.so
lib/libgnuradio-osmosdr.so.0
lib/libgnuradio-osmosdr.so.0.1.5git
%%PYTHON_SITELIBDIR%%/osmosdr/__init__.py
%%PYTHON_SITELIBDIR%%/osmosdr/__init__.pyc
@ -25,6 +25,6 @@ lib/libgnuradio-osmosdr.so.0.1.5git
%%PYTHON_SITELIBDIR%%/osmosdr/osmosdr_swig.pyc
%%PYTHON_SITELIBDIR%%/osmosdr/osmosdr_swig.pyo
libdata/pkgconfig/gnuradio-osmosdr.pc
share/gnuradio/grc/blocks/osmosdr_sink.xml
share/gnuradio/grc/blocks/osmosdr_source.xml
share/gnuradio/grc/blocks/rtlsdr_source.xml
share/gnuradio/grc/blocks/osmosdr_sink.block.yml
share/gnuradio/grc/blocks/osmosdr_source.block.yml
share/gnuradio/grc/blocks/rtlsdr_source.block.yml