Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 21 Feb 2020 17:57:34 +0000 (UTC)
From:      Ganael LAPLANCHE <martymac@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r526640 - in head/comms: gqrx gr-osmosdr gr-osmosdr/files
Message-ID:  <202002211757.01LHvY8k050320@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: martymac
Date: Fri Feb 21 17:57:33 2020
New Revision: 526640
URL: https://svnweb.freebsd.org/changeset/ports/526640

Log:
  Update comms/gr-osmosdr to 0.2.0 and bump dependent ports' revisions
  
  Note that Python support has been disabled because gr-osmosdr now requires
  Python 3 while Gnuradio still uses Python 2. Python support will be re-enabled
  once Gnuradio switches to Python 3.

Added:
  head/comms/gr-osmosdr/files/gnuradio-osmosdr.pc.in   (contents, props changed)
Deleted:
  head/comms/gr-osmosdr/files/patch-00-gr38-compat.txt
  head/comms/gr-osmosdr/files/patch-01-gr38-blocks-fix.txt
  head/comms/gr-osmosdr/files/patch-CMakeLists.txt
Modified:
  head/comms/gqrx/Makefile
  head/comms/gr-osmosdr/Makefile
  head/comms/gr-osmosdr/distinfo
  head/comms/gr-osmosdr/pkg-plist

Modified: head/comms/gqrx/Makefile
==============================================================================
--- head/comms/gqrx/Makefile	Fri Feb 21 17:48:08 2020	(r526639)
+++ head/comms/gqrx/Makefile	Fri Feb 21 17:57:33 2020	(r526640)
@@ -3,6 +3,7 @@
 
 PORTNAME=	gqrx
 PORTVERSION=	2.12.1
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	comms hamradio
 

Modified: head/comms/gr-osmosdr/Makefile
==============================================================================
--- head/comms/gr-osmosdr/Makefile	Fri Feb 21 17:48:08 2020	(r526639)
+++ head/comms/gr-osmosdr/Makefile	Fri Feb 21 17:57:33 2020	(r526640)
@@ -2,9 +2,7 @@
 
 PORTNAME=	gr-osmosdr
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.1.4-127
-DISTVERSIONSUFFIX=	-g4d83c60
-PORTREVISION=	1
+DISTVERSION=	0.2.0
 PORTEPOCH=	1
 CATEGORIES=	comms hamradio
 
@@ -13,11 +11,10 @@ COMMENT=	GNU Radio OsmoSDR module
 
 LICENSE=	GPLv3
 
-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 \
+		libvolk.so:comms/gnuradio \
 		libboost_system.so:devel/boost-libs \
 		libboost_thread.so:devel/boost-libs \
 		liblog4cpp.so:devel/log4cpp \
@@ -25,19 +22,23 @@ 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 python:2.7 tar:tgz
+USES=	cmake compiler:c++11-lang fortran pkgconfig tar:tgz
 
+SUB_LIST=	VERSION=${PORTVERSION}
+SUB_FILES=	gnuradio-osmosdr.pc
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	osmocom
 
 USE_LDCONFIG=	yes
-BINARY_ALIAS=	swig=swig3.0
 
 # See lib/CMakeLists.txt to enable more components
-CMAKE_ARGS+=	-DENABLE_DEFAULT:BOOL=OFF \
-		-DENABLE_FILE:BOOL=ON \
-		-DENABLE_PYTHON=ON \
-		-DPYTHON_EXECUTABLE:STRING="${PYTHON_CMD}"
+# 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
 
 CXXFLAGS+=	-std=c++11
 
@@ -51,6 +52,7 @@ 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.1.5git
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgnuradio-osmosdr.so.0.2.0
+	${INSTALL_DATA} ${WRKDIR}/gnuradio-osmosdr.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig/
 
 .include <bsd.port.mk>

Modified: head/comms/gr-osmosdr/distinfo
==============================================================================
--- head/comms/gr-osmosdr/distinfo	Fri Feb 21 17:48:08 2020	(r526639)
+++ head/comms/gr-osmosdr/distinfo	Fri Feb 21 17:57:33 2020	(r526640)
@@ -1,3 +1,3 @@
-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
+TIMESTAMP = 1581963753
+SHA256 (osmocom-gr-osmosdr-v0.2.0_GH0.tar.gz) = 9812429d97bc54f0a8917b880ca9e7e2421c66aeaac8ce5608161a8ae7007122
+SIZE (osmocom-gr-osmosdr-v0.2.0_GH0.tar.gz) = 251163

Added: head/comms/gr-osmosdr/files/gnuradio-osmosdr.pc.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/gr-osmosdr/files/gnuradio-osmosdr.pc.in	Fri Feb 21 17:57:33 2020	(r526640)
@@ -0,0 +1,15 @@
+prefix=%%PREFIX%%
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: gnuradio-osmosdr
+Description: GNU Radio block for various radio hardware
+URL: http://sdr.osmocom.org/trac/wiki/GrOsmoSDR
+Version: v%%VERSION%%
+Requires: gnuradio-runtime gnuradio-blocks
+Requires.private: 
+Conflicts:
+Cflags: -I${includedir}
+Libs: -L${libdir} -lgnuradio-osmosdr
+Libs.private: -L${libdir}

Modified: head/comms/gr-osmosdr/pkg-plist
==============================================================================
--- head/comms/gr-osmosdr/pkg-plist	Fri Feb 21 17:48:08 2020	(r526639)
+++ head/comms/gr-osmosdr/pkg-plist	Fri Feb 21 17:57:33 2020	(r526640)
@@ -1,30 +1,14 @@
-bin/osmocom_fft
-bin/osmocom_siggen
-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/osmosdrConfig.cmake
+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.1.5git
-%%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
+lib/libgnuradio-osmosdr.so.0.2.0
+lib/libgnuradio-osmosdr.so.0.2.0.0
 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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002211757.01LHvY8k050320>