diff options
| author | Ganael LAPLANCHE <martymac@FreeBSD.org> | 2020-08-19 10:08:07 +0000 |
|---|---|---|
| committer | Ganael LAPLANCHE <martymac@FreeBSD.org> | 2020-08-19 10:08:07 +0000 |
| commit | 41139fd292d9ce3748cc896cd000daf4b02e26f6 (patch) | |
| tree | 3e24e18ec48d5049e3c2e2a23914f70c0fbafe9b /comms | |
| parent | x11-wm/hikari: update to 2.1.2 (diff) | |
Update gr-osmosdr to 0.2.2 and re-enable Python support
Notes
Notes:
svn path=/head/; revision=545298
Diffstat (limited to 'comms')
| -rw-r--r-- | comms/gqrx/Makefile | 2 | ||||
| -rw-r--r-- | comms/gr-osmosdr/Makefile | 15 | ||||
| -rw-r--r-- | comms/gr-osmosdr/distinfo | 6 | ||||
| -rw-r--r-- | comms/gr-osmosdr/pkg-plist | 18 |
4 files changed, 29 insertions, 12 deletions
diff --git a/comms/gqrx/Makefile b/comms/gqrx/Makefile index 0fd87d76af45..c59dc5dce310 100644 --- a/comms/gqrx/Makefile +++ b/comms/gqrx/Makefile @@ -4,7 +4,7 @@ PORTNAME= gqrx PORTVERSION= 2.12.1 DISTVERSIONPREFIX= v -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= comms hamradio diff --git a/comms/gr-osmosdr/Makefile b/comms/gr-osmosdr/Makefile index 139231b78b9a..be54c5686db6 100644 --- a/comms/gr-osmosdr/Makefile +++ b/comms/gr-osmosdr/Makefile @@ -2,7 +2,7 @@ PORTNAME= gr-osmosdr DISTVERSIONPREFIX= v -DISTVERSION= 0.2.0 +DISTVERSION= 0.2.2 PORTEPOCH= 1 CATEGORIES= comms hamradio @@ -11,10 +11,12 @@ COMMENT= GNU Radio OsmoSDR module LICENSE= GPLv3 +BUILD_DEPENDS= swig:devel/swig \ + cheetah:devel/py-cheetah3@${PY_FLAVOR} LIB_DEPENDS= libgnuradio-runtime.so:comms/gnuradio \ libgnuradio-pmt.so:comms/gnuradio \ libgnuradio-blocks.so:comms/gnuradio \ - libvolk.so:comms/gnuradio \ + libvolk.so:devel/volk \ libboost_system.so:devel/boost-libs \ libboost_thread.so:devel/boost-libs \ liblog4cpp.so:devel/log4cpp \ @@ -22,7 +24,7 @@ LIB_DEPENDS= libgnuradio-runtime.so:comms/gnuradio \ libgmp.so:math/gmp \ liborc-0.4.so:devel/orc -USES= cmake compiler:c++11-lang fortran pkgconfig tar:tgz +USES= cmake compiler:c++11-lang fortran pkgconfig python:3.7+ tar:tgz SUB_LIST= VERSION=${PORTVERSION} SUB_FILES= gnuradio-osmosdr.pc @@ -33,12 +35,9 @@ GH_ACCOUNT= osmocom USE_LDCONFIG= yes # See lib/CMakeLists.txt to enable more components -# XXX Python support disabled because gr-osmosdr now requires Python 3 -# while Gnuradio still uses Python 2. As a consequence, GR_PYTHON_DIR forcibly -# points to Python 2 directory (which is incorrect to install version 3 code). -# We will re-enable Python support once Gnuradio switches to Python 3 CMAKE_ARGS+= -DENABLE_FILE:BOOL=ON \ - -DENABLE_PYTHON=OFF + -DENABLE_PYTHON=ON \ + -DPYTHON_EXECUTABLE:STRING="${PYTHON_CMD}" CXXFLAGS+= -std=c++11 diff --git a/comms/gr-osmosdr/distinfo b/comms/gr-osmosdr/distinfo index ab3a10a07106..9269b6c1b4dc 100644 --- a/comms/gr-osmosdr/distinfo +++ b/comms/gr-osmosdr/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1581963753 -SHA256 (osmocom-gr-osmosdr-v0.2.0_GH0.tar.gz) = 9812429d97bc54f0a8917b880ca9e7e2421c66aeaac8ce5608161a8ae7007122 -SIZE (osmocom-gr-osmosdr-v0.2.0_GH0.tar.gz) = 251163 +TIMESTAMP = 1597088012 +SHA256 (osmocom-gr-osmosdr-v0.2.2_GH0.tar.gz) = 5a7ce7afee38a56191b5d16cb4a91c92476729ff16ed09cbba5a3851ac619713 +SIZE (osmocom-gr-osmosdr-v0.2.2_GH0.tar.gz) = 251425 diff --git a/comms/gr-osmosdr/pkg-plist b/comms/gr-osmosdr/pkg-plist index 670648086171..1ed17fd777dd 100644 --- a/comms/gr-osmosdr/pkg-plist +++ b/comms/gr-osmosdr/pkg-plist @@ -1,9 +1,14 @@ +bin/osmocom_fft +bin/osmocom_siggen_nogui +bin/osmocom_spectrum_sense include/osmosdr/api.h include/osmosdr/device.h include/osmosdr/pimpl.h include/osmosdr/ranges.h include/osmosdr/sink.h 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/gnuradio-osmosdrConfig.cmake lib/cmake/osmosdr/gnuradio-osmosdrTargets-%%CMAKE_BUILD_TYPE%%.cmake @@ -11,4 +16,17 @@ lib/cmake/osmosdr/gnuradio-osmosdrTargets.cmake lib/libgnuradio-osmosdr.so lib/libgnuradio-osmosdr.so.0.2.0 lib/libgnuradio-osmosdr.so.0.2.0.0 +%%PYTHON_SITELIBDIR%%/osmosdr/__init__.py +%%PYTHON_SITELIBDIR%%/osmosdr/__init__.pyc +%%PYTHON_SITELIBDIR%%/osmosdr/__init__.pyo +%%PYTHON_SITELIBDIR%%/osmosdr/_osmosdr_swig.so +%%PYTHON_SITELIBDIR%%/osmosdr/osmocom_siggen_base.py +%%PYTHON_SITELIBDIR%%/osmosdr/osmocom_siggen_base.pyc +%%PYTHON_SITELIBDIR%%/osmosdr/osmocom_siggen_base.pyo +%%PYTHON_SITELIBDIR%%/osmosdr/osmosdr_swig.py +%%PYTHON_SITELIBDIR%%/osmosdr/osmosdr_swig.pyc +%%PYTHON_SITELIBDIR%%/osmosdr/osmosdr_swig.pyo libdata/pkgconfig/gnuradio-osmosdr.pc +share/gnuradio/grc/blocks/osmosdr_sink.block.yml +share/gnuradio/grc/blocks/osmosdr_source.block.yml +share/gnuradio/grc/blocks/rtlsdr_source.block.yml |