Index: head/comms/gnuradio/Makefile =================================================================== --- head/comms/gnuradio/Makefile (revision 499092) +++ head/comms/gnuradio/Makefile (revision 499093) @@ -1,150 +1,149 @@ # $FreeBSD$ PORTNAME= gnuradio #MASTER_SITES= http://gnuradio.org/releases/gnuradio/ # Temporary git version DISTVERSION= 3.8.g20190309 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= comms astro hamradio MAINTAINER= hamradio@FreeBSD.org COMMENT= Amateur Radio Software defined radio LICENSE= GPLv3 -BROKEN= fails to build with boost 1.70, see bug 236601 BROKEN_aarch64= fails to compile: /usr/lib/clang/5.0.0/include/mmintrin.h:47:5: use of undeclared identifier '__builtin_ia32_emms'; did you mean '__builtin_isless'? BROKEN_armv6= fails to compile: /usr/lib/clang/5.0.0/include/mmintrin.h:47:5: use of undeclared identifier '__builtin_ia32_emms'; did you mean '__builtin_isless'? BROKEN_armv7= fails to compile: /usr/lib/clang/5.0.0/include/mmintrin.h:47:5: use of undeclared identifier '__builtin_ia32_emms'; did you mean '__builtin_isless'? BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \ ${PYNUMPY} \ ${PYTHON_SITELIBDIR}/yaml/__init__.py:devel/py-yaml@${PY_FLAVOR} \ ${PYTHON_SITELIBDIR}/gi/__init__.py:devel/py-gobject3@${PY_FLAVOR} \ ${PYTHON_SITELIBDIR}/cairo/__init__.py:graphics/py-cairo@${PY_FLAVOR} \ ${PYTHON_SITELIBDIR}/ephem/__init__.py:astro/pyephem@${PY_FLAVOR} \ ${PYTHON_SITELIBDIR}/mako/__init__.py:textproc/py-mako@${PY_FLAVOR} \ ${PYTHON_SITELIBDIR}/six.py:devel/py-six@${PY_FLAVOR} \ aconnect:audio/alsa-utils \ cheetah:devel/py-cheetah@${PY_FLAVOR} \ guile:lang/guile \ minixmlto:textproc/minixmlto \ sdl-config:devel/sdl12 \ swig3.0:devel/swig30 \ xdg-open:devel/xdg-utils LIB_DEPENDS= libcodec2.so:audio/codec2 \ libfftw3.so:math/fftw3 \ libfftw3f.so:math/fftw3-float \ libgmpxx.so:math/gmp \ libqwt6.so:x11-toolkits/qwt6 \ ${PY_BOOST} \ liblog4cpp.so:devel/log4cpp \ libportaudio.so:audio/portaudio \ libjack.so:audio/jack \ libasound.so:audio/alsa-lib \ libgsl.so:math/gsl \ libgsm.so:audio/gsm \ libboost_date_time.so:devel/boost-libs \ liborc-0.4.so:devel/orc RUN_DEPENDS:= ${BUILD_DEPENDS} USE_GITHUB= yes GH_ACCOUNT= gnuradio GH_PROJECT= gnuradio volk:volk GH_TAGNAME= a664001 d250816:volk # USES=compiler:c11 is necessary because base GCC fails: # volk/lib/volk_cpu.c: In function 'i_can_has_3dnow': # volk/lib/volk_cpu.c:62: error: can't find a register in class 'BREG' while reloading 'asm' # volk/lib/volk_cpu.c:62: error: 'asm' operand has impossible constraints USES= cmake compiler:c11 desktop-file-utils fortran gnome iconv \ perl5 pkgconfig pyqt:5 python:2.7 qt:5 shared-mime-info shebangfix SHEBANG_FILES= grc/scripts/freedesktop/grc_setup_freedesktop.in \ gnuradio-runtime/python/gnuradio/ctrlport/gr-ctrlport-monitor \ gnuradio-runtime/python/gnuradio/ctrlport/gr-perf-monitorx CMAKE_ARGS+= -DCMAKE_INSTALL_RPATH:STRING="${LOCALBASE}/lib/gcc${_GCC_VER}" \ -DENABLE_GR_CTRLPORT="YES" \ -DICONV_LIB:STRING="X${ICONV_LIB}" \ -DICONV_PREFIX:STRING="${ICONV_PREFIX}" \ -DLOCALBASE:STRING="${LOCALBASE}" \ -DPYTHON_EXECUTABLE:STRING="${PYTHON_CMD}" \ -DSWIG_EXECUTABLE:STRING="${LOCALBASE}/bin/swig3.0"\ -DXMLTO_EXECUTABLE:STRING=minixmlto # for detailed debugging uncomment the next line #CMAKE_ARGS+= --debug-output --trace MAJOR_SUB_VER= 3.8 #MAJOR_SUB_VER= ${PORTVERSION} DOCSDIR= share/doc/${PORTNAME}-${PORTVERSION} USE_GNOME= pygtk2 USE_PYQT= core gui opengl USE_WX= 3.0 USE_QT= buildtools core gui xml qmake widgets WX_COMPS= wx wx:build wx:run python:build python:run USE_LDCONFIG= yes PLIST_SUB+= MAJOR_SUB_VER="${MAJOR_SUB_VER}"git LIBSTRIP_FILES= analog audio blocks channels digital dtv fec fft\ filter pmt qtgui runtime trellis video-sdl\ vocoder wavelet OPTIONS_DEFINE= DOCS UHD TESTING DOXYGEN # Unfortunately building docs on i386 fails ##OPTIONS_EXCLUDE_${i386}= DOXYGEN # Yay. building docs is broken on 10 and HEAD too so turn them all off OPTIONS_EXCLUDE= DOXYGEN OPTIONS_DEFAULT= UHD OPTIONS_SUB= yes UHD_DESC= Include UHD support from Ettus TESTING_DESC= Include testing support PLIST_SUB+= PORTVERSION=${PORTVERSION} DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen \ sphinx-apidoc:textproc/py-sphinx@${PY_FLAVOR} \ dot:graphics/graphviz \ xmlto:textproc/xmlto \ freefont-ttf>0:x11-fonts/freefont-ttf DOXYGEN_CMAKE_ON= -DENABLE_DOXYGEN:STRING="ON" \ -DENABLE_DOCS:STRING="ON" DOXYGEN_CMAKE_OFF= -DENABLE_DOXYGEN:STRING="OFF" \ -DENABLE_DOCS:STRING="OFF" HAVE_PORTDOCS= YES UHD_CMAKE_ON= -DENABLE_GR_UHD:STRING="ON" UHD_CMAKE_OFF= -DENABLE_GR_UHD:STRING="OFF" TESTING_CMAKE_ON= -DENABLE_TESTING:STRING="ON" TESTING_CMAKE_OFF= -DENABLE_TESTING:STRING="OFF" .include .if ${PORT_OPTIONS:MUHD} LIBSTRIP_FILES+= uhd LIB_DEPENDS+= libuhd.so:comms/uhd PLIST_SUB+= UHD="" .else PLIST_SUB+= UHD="@comment " .endif PATCH_FILES= docs/doxygen/Doxyfile.in \ gr-fec/lib/CMakeLists.txt post-extract: @${RMDIR} ${WRKSRC}/volk @${MV} ${WRKSRC_volk} ${WRKSRC}/volk post-patch: @${FIND} ${WRKSRC}/.. -name CMakeLists.txt | \ ${XARGS} ${REINPLACE_CMD} -e \ "s|{GR_LIBRARY_DIR}/pkgconfig|{GR_PKGCONFIG_DIR}/pkgconfig|g" .for p in ${PATCH_FILES} @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ ${WRKSRC}/${p} .endfor post-install: .for a in ${LIBSTRIP_FILES} ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgnuradio-${a}.so.${MAJOR_SUB_VER}git .endfor .include Index: head/comms/gnuradio/files/patch-gnuradio-runtime_lib_thread_thread.cc =================================================================== --- head/comms/gnuradio/files/patch-gnuradio-runtime_lib_thread_thread.cc (revision 499092) +++ head/comms/gnuradio/files/patch-gnuradio-runtime_lib_thread_thread.cc (nonexistent) @@ -1,34 +0,0 @@ ---- gnuradio-runtime/lib/thread/thread.cc.orig 2016-09-02 04:16:12 UTC -+++ gnuradio-runtime/lib/thread/thread.cc -@@ -284,6 +284,7 @@ namespace gr { - void - thread_bind_to_processor(gr_thread_t thread, const std::vector &mask) - { -+#ifdef _GNU_SOURCE - cpu_set_t set; - size_t len = sizeof(cpu_set_t); - std::vector _mask = mask; -@@ -299,6 +300,7 @@ namespace gr { - s << "thread_bind_to_processor failed with error: " << ret << std::endl; - throw std::runtime_error(s.str()); - } -+#endif - } - - void -@@ -310,6 +312,7 @@ namespace gr { - void - thread_unbind(gr_thread_t thread) - { -+#ifdef _GNU_SOURCE - cpu_set_t set; - size_t len = sizeof(cpu_set_t); - -@@ -325,6 +328,7 @@ namespace gr { - s << "thread_unbind failed with error: " << ret << std::endl; - throw std::runtime_error(s.str()); - } -+#endif - } - - int Property changes on: head/comms/gnuradio/files/patch-gnuradio-runtime_lib_thread_thread.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -1 \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/comms/gnuradio/files/patch-gr-blocks_lib_socket__pdu__impl.cc =================================================================== --- head/comms/gnuradio/files/patch-gr-blocks_lib_socket__pdu__impl.cc (nonexistent) +++ head/comms/gnuradio/files/patch-gr-blocks_lib_socket__pdu__impl.cc (revision 499093) @@ -0,0 +1,16 @@ +--- gr-blocks/lib/socket_pdu_impl.cc.orig 2019-04-16 13:45:00 UTC ++++ gr-blocks/lib/socket_pdu_impl.cc +@@ -165,8 +165,11 @@ namespace gr { + void + socket_pdu_impl::start_tcp_accept() + { +- tcp_connection::sptr new_connection = tcp_connection::make(d_acceptor_tcp->get_io_service(), d_rxbuf.size(), d_tcp_no_delay); +- ++#if (BOOST_VERSION >= 107000) ++ tcp_connection::sptr new_connection = tcp_connection::make(d_io_service, d_rxbuf.size(), d_tcp_no_delay); ++#else ++ tcp_connection::sptr new_connection = tcp_connection::make(d_acceptor_tcp->get_io_service(), d_rxbuf.size(), d_tcp_no_delay); ++#endif + d_acceptor_tcp->async_accept(new_connection->socket(), + boost::bind(&socket_pdu_impl::handle_tcp_accept, this, + new_connection, boost::asio::placeholders::error)); Property changes on: head/comms/gnuradio/files/patch-gr-blocks_lib_socket__pdu__impl.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +1 \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property