Index: head/comms/uhd/Makefile =================================================================== --- head/comms/uhd/Makefile (revision 459614) +++ head/comms/uhd/Makefile (revision 459615) @@ -1,76 +1,74 @@ # $FreeBSD$ PORTNAME= uhd PORTVERSION= 3.10.2.0 -PORTREVISION= 1 -#PORTREVISION= 4 +PORTREVISION= 2 CATEGORIES= comms hamradio MASTER_SITES= http://files.ettus.com/binaries/images/ DISTFILES= ${IMAGE_FILE} DIST_SUBDIR= ${PORTNAME} MAINTAINER= mr@FreeBSD.org COMMENT= Ettus Research UHD driver framework LIB_DEPENDS= libboost_python.so:devel/boost-python-libs BUILD_DEPENDS= ${LOCALBASE}/include/boost/tuple/tuple.hpp:devel/boost-libs \ cheetah-analyze:devel/py-cheetah@${PY_FLAVOR} \ rst2html:textproc/py-docutils \ orcc:devel/orc \ ${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako@${PY_FLAVOR} USE_GITHUB= yes GH_ACCOUNT= EttusResearch GH_TAGNAME= bd6e21dc06cfca6f1165b1eba6ddbf5a46dc343c CONFLICTS= usrp-[0-9]* -BROKEN= fails to build with boost 1.66, see bug 224087 BROKEN_powerpc64= fails to link: undefined reference to boost function USES= compiler:c++0x cmake:outsource ncurses pkgconfig \ dos2unix python:2.7 shebangfix USE_LDCONFIG= yes CMAKE_SOURCE_PATH= ${WRKSRC}/host #MAKE_JOBS_UNSAFE= yes CXXFLAGS_amd64= -msse2 CXXFLAGS_i386= -msse2 SHEBANG_GLOB= *.py *.py.in CMAKE_ARGS+= -DPKG_LIB_DIR:STRING="share/uhd" -DUHD_TXRX_DEBUG_PRINTS="yes" # for excruciating debug use this -db #CMAKE_ARGS+= --debug-output --trace IMAGE_FILE= uhd-images_003.010.002.000-release.zip OPTIONS_DEFINE= DOXYGEN #OPTIONS_DEFAULT= DOXYGEN OPTIONS_SUB=yes DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen .include .if ${PORT_OPTIONS:MDOXYGEN} BUILD_DEPENDS+= doxygen:devel/doxygen CMAKE_ARGS+= -DENABLE_DOXYGEN:STRING="ON" HAVEDOCS= YES .endif post-patch: # USES=pathfix handles LIBRARY_INSTALL_DIR but not LIBRARY_DIR @${REINPLACE_CMD} '/pkgconfig/s|LIBRARY_DIR}|CMAKE_INSTALL_PREFIX}/libdata|' \ ${PATCH_WRKSRC}/host/CMakeLists.txt do-install: # install host component # hack the install prefix now @${REINPLACE_CMD} -e "s|/usr/local|${STAGEDIR}${PREFIX}|g" \ ${CONFIGURE_WRKSRC}/cmake_install.cmake cd ${CONFIGURE_WRKSRC} && ${MAKE_CMD} install .for subdir in images ${CP} -Rp ${WRKDIR}/${IMAGE_FILE:S|.zip||}/share/uhd/${subdir} ${STAGEDIR}${DATADIR} .endfor .include Index: head/comms/uhd/files/patch-host_examples_network_relay.cpp =================================================================== --- head/comms/uhd/files/patch-host_examples_network_relay.cpp (nonexistent) +++ head/comms/uhd/files/patch-host_examples_network_relay.cpp (revision 459615) @@ -0,0 +1,16 @@ +--- host/examples/network_relay.cpp.orig 2017-12-17 19:37:02.232333000 +0000 ++++ host/examples/network_relay.cpp 2017-12-17 19:37:35.331222000 +0000 +@@ -128,5 +128,5 @@ + std::vector buff(insane_mtu); + while (not boost::this_thread::interruption_requested()){ +- if (wait_for_recv_ready(_server_socket->native())){ ++ if (wait_for_recv_ready(_server_socket->native_handle())){ + boost::mutex::scoped_lock lock(_endpoint_mutex); + const size_t len = _server_socket->receive_from(asio::buffer(&buff.front(), buff.size()), _endpoint); +@@ -154,5 +154,5 @@ + std::vector buff(insane_mtu); + while (not boost::this_thread::interruption_requested()){ +- if (wait_for_recv_ready(_client_socket->native())){ ++ if (wait_for_recv_ready(_client_socket->native_handle())){ + const size_t len = _client_socket->receive(asio::buffer(&buff.front(), buff.size())); + boost::mutex::scoped_lock lock(_endpoint_mutex); Property changes on: head/comms/uhd/files/patch-host_examples_network_relay.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ 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 Index: head/comms/uhd/files/patch-host_lib_transport_tcp_zero_copy.cpp =================================================================== --- head/comms/uhd/files/patch-host_lib_transport_tcp_zero_copy.cpp (nonexistent) +++ head/comms/uhd/files/patch-host_lib_transport_tcp_zero_copy.cpp (revision 459615) @@ -0,0 +1,9 @@ +--- host/lib/transport/tcp_zero_copy.cpp.orig 2017-12-17 19:39:49.890757000 +0000 ++++ host/lib/transport/tcp_zero_copy.cpp 2017-12-17 19:40:36.125127000 +0000 +@@ -155,5 +155,5 @@ + _socket.reset(new asio::ip::tcp::socket(_io_service)); + _socket->connect(receiver_endpoint); +- _sock_fd = _socket->native(); ++ _sock_fd = _socket->native_handle(); + + //packets go out ASAP Property changes on: head/comms/uhd/files/patch-host_lib_transport_tcp_zero_copy.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ 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 Index: head/comms/uhd/files/patch-host_lib_transport_udp_simple.cpp =================================================================== --- head/comms/uhd/files/patch-host_lib_transport_udp_simple.cpp (nonexistent) +++ head/comms/uhd/files/patch-host_lib_transport_udp_simple.cpp (revision 459615) @@ -0,0 +1,9 @@ +--- host/lib/transport/udp_simple.cpp.orig 2017-12-17 19:40:02.609104000 +0000 ++++ host/lib/transport/udp_simple.cpp 2017-12-17 19:40:47.660730000 +0000 +@@ -57,5 +57,5 @@ + + size_t recv(const asio::mutable_buffer &buff, double timeout){ +- if (not wait_for_recv_ready(_socket->native(), timeout)) return 0; ++ if (not wait_for_recv_ready(_socket->native_handle(), timeout)) return 0; + return _socket->receive_from(asio::buffer(buff), _recv_endpoint); + } Property changes on: head/comms/uhd/files/patch-host_lib_transport_udp_simple.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ 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 Index: head/comms/uhd/files/patch-host_lib_transport_udp_zero_copy.cpp =================================================================== --- head/comms/uhd/files/patch-host_lib_transport_udp_zero_copy.cpp (nonexistent) +++ head/comms/uhd/files/patch-host_lib_transport_udp_zero_copy.cpp (revision 459615) @@ -0,0 +1,9 @@ +--- host/lib/transport/udp_zero_copy.cpp.orig 2017-12-17 16:25:59.637675000 +0100 ++++ host/lib/transport/udp_zero_copy.cpp 2017-12-17 16:26:12.713784000 +0100 +@@ -191,5 +191,5 @@ + _socket->open(asio::ip::udp::v4()); + _socket->connect(receiver_endpoint); +- _sock_fd = _socket->native(); ++ _sock_fd = _socket->native_handle(); + + //allocate re-usable managed receive buffers Property changes on: head/comms/uhd/files/patch-host_lib_transport_udp_zero_copy.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ 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