diff --git a/comms/gr-osmosdr/Makefile b/comms/gr-osmosdr/Makefile index fea82dc03ad5..b4412fe8e405 100644 --- a/comms/gr-osmosdr/Makefile +++ b/comms/gr-osmosdr/Makefile @@ -1,57 +1,56 @@ PORTNAME= gr-osmosdr DISTVERSIONPREFIX= v -DISTVERSION= 0.2.3 -PORTREVISION= 13 +DISTVERSION= 0.2.6 PORTEPOCH= 1 CATEGORIES= comms hamradio MAINTAINER= martymac@FreeBSD.org COMMENT= GNU Radio OsmoSDR module WWW= http://sdr.osmocom.org/trac 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:devel/volk \ libboost_system.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 tar:tgz SUB_LIST= VERSION=${PORTVERSION} SUB_FILES= gnuradio-osmosdr.pc USE_GITHUB= yes GH_ACCOUNT= osmocom USE_LDCONFIG= yes # See lib/CMakeLists.txt to enable more components CMAKE_ARGS+= -DENABLE_FILE:BOOL=ON \ -DENABLE_PYTHON=ON \ -DPYTHON_EXECUTABLE:STRING="${PYTHON_CMD}" CXXFLAGS+= -std=c++11 OPTIONS_DEFINE= RTLSDR HACKRF RTLSDR_DESC= Enable rtl-sdr (RTL2832) support OPTIONS_DEFAULT= RTLSDR RTLSDR_LIB_DEPENDS= librtlsdr.so:comms/rtl-sdr RTLSDR_CMAKE_ON= -DENABLE_RTL:BOOL=ON -DENABLE_RTL_TCP:BOOL=ON HACKRF_DESC= Enable hackrf one hardware support HACKRF_LIB_DEPENDS= libhackrf.so:comms/hackrf HACKRF_CMAKE_ON= -DENABLE_HACKRF:BOOL=ON post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgnuradio-osmosdr.so.0.2.0 ${INSTALL_DATA} ${WRKDIR}/gnuradio-osmosdr.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig/ .include diff --git a/comms/gr-osmosdr/distinfo b/comms/gr-osmosdr/distinfo index 1f42152e7d10..07b37a84ca3e 100644 --- a/comms/gr-osmosdr/distinfo +++ b/comms/gr-osmosdr/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1609793232 -SHA256 (osmocom-gr-osmosdr-v0.2.3_GH0.tar.gz) = 11b1eb13725ced5ded9121a10aaf7bccf2430c5c69d020791408219968665b71 -SIZE (osmocom-gr-osmosdr-v0.2.3_GH0.tar.gz) = 252727 +TIMESTAMP = 1744921627 +SHA256 (osmocom-gr-osmosdr-v0.2.6_GH0.tar.gz) = c50514d42be5a56a5b6b26fc12a8539ea9a433c28a3b96506084bd646879f91f +SIZE (osmocom-gr-osmosdr-v0.2.6_GH0.tar.gz) = 268206 diff --git a/comms/gr-osmosdr/files/patch-swig b/comms/gr-osmosdr/files/patch-swig deleted file mode 100644 index 0060bf9de535..000000000000 --- a/comms/gr-osmosdr/files/patch-swig +++ /dev/null @@ -1,10 +0,0 @@ ---- swig/osmosdr_swig.i.orig 2020-12-18 12:22:24 UTC -+++ swig/osmosdr_swig.i -@@ -5,6 +5,7 @@ - // suppress Warning 319: No access specifier given for base class 'boost::noncopyable' (ignored). - #pragma SWIG nowarn=319 - -+%include - %include "gnuradio.i" // the common stuff - - //load generated python docstrings diff --git a/comms/gr-osmosdr/pkg-plist b/comms/gr-osmosdr/pkg-plist index 1ed17fd777dd..b93232d11690 100644 --- a/comms/gr-osmosdr/pkg-plist +++ b/comms/gr-osmosdr/pkg-plist @@ -1,32 +1,22 @@ 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 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/osmosdr_python%%PYTHON_EXT_SUFFIX%%.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