Index: Makefile =================================================================== --- Makefile (revision 461775) +++ Makefile (working copy) @@ -2,7 +2,7 @@ PORTNAME= usrp PORTVERSION= 3.4.3 -PORTREVISION= 16 +PORTREVISION= 17 CATEGORIES= comms hamradio MASTER_SITES= LOCAL/adrian DISTNAME= Ettus-USRP-3.4.3 @@ -10,9 +10,17 @@ MAINTAINER= hamradio@FreeBSD.org COMMENT= Ettus Research USRP driver framework -BROKEN= fails to build with boost 1.66, see bug 224088 - -LIB_DEPENDS= libboost_python.so:devel/boost-python-libs +LIB_DEPENDS= libboost_python.so:devel/boost-python-libs \ + libboost_date_time.so:devel/boost-libs \ + libboost_filesystem.so:devel/boost-libs \ + libboost_program_options.so:devel/boost-libs \ + libboost_regex.so:devel/boost-libs \ + libboost_system.so:devel/boost-libs \ + libboost_thread.so:devel/boost-libs \ + libboost_unit_test_framework.so:devel/boost-libs \ + libboost_chrono.so:devel/boost-libs \ + libboost_atomic.so:devel/boost-libs \ + liborc-0.4.so:devel/orc BUILD_DEPENDS= ${LOCALBASE}/include/boost/tuple/tuple.hpp:devel/boost-libs \ cheetah-analyze:devel/py-cheetah \ rst2html:textproc/py-docutils \ Index: files/patch-boost_1_66 =================================================================== --- files/patch-boost_1_66 (nonexistent) +++ files/patch-boost_1_66 (working copy) @@ -0,0 +1,88 @@ +--- host/examples/network_relay.cpp.orig 2018-02-14 10:56:26 UTC ++++ host/examples/network_relay.cpp +@@ -130,7 +130,7 @@ private: + spawn_mutex.unlock(); + 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); + lock.unlock(); +@@ -156,7 +156,7 @@ private: + spawn_mutex.unlock(); + 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); + _server_socket->send_to(asio::buffer(&buff.front(), len), _endpoint); + +Index: files/patch-host_lib_transport_tcp_zero_copy.cpp +=================================================================== +--- files/patch-host_lib_transport_tcp_zero_copy.cpp (nicht existent) ++++ files/patch-host_lib_transport_tcp_zero_copy.cpp (Arbeitskopie) +@@ -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 + +Index: files/patch-host_lib_transport_udp_simple.cpp +=================================================================== +--- files/patch-host_lib_transport_udp_simple.cpp (nicht existent) ++++ files/patch-host_lib_transport_udp_simple.cpp (Arbeitskopie) +@@ -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); ++ } + + +Index: files/patch-host_lib_transport_udp_zero_copy.cpp +=================================================================== +--- files/patch-host_lib_transport_udp_zero_copy.cpp (nicht existent) ++++ files/patch-host_lib_transport_udp_zero_copy.cpp (Arbeitskopie) +@@ -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 +--- host/lib/transport/udp_zero_copy.cpp.orig 2018-02-14 10:39:54 UTC ++++ host/lib/transport/udp_zero_copy.cpp +@@ -163,7 +163,7 @@ public: + _socket = socket_sptr(new asio::ip::udp::socket(_io_service)); + _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 + for (size_t i = 0; i < get_num_recv_frames(); i++){ +--- host/lib/transport/udp_simple.cpp.orig 2018-02-14 10:43:11 UTC ++++ host/lib/transport/udp_simple.cpp +@@ -56,7 +56,7 @@ public: + } + + 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: files/patch-boost_1_66 ___________________________________________________________________ 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