<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/93fad5afeb2443c2c24fc69b929b39dba8c22fe9">https://github.com/macports/macports-ports/commit/93fad5afeb2443c2c24fc69b929b39dba8c22fe9</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 93fad5a uhd: add patch to fix method deprecated in Boost 1.47.0 and removed in Boost 1.66.0
</span>93fad5a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 93fad5afeb2443c2c24fc69b929b39dba8c22fe9
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Tue Dec 19 14:39:33 2017 -0500
<span style='display:block; white-space:pre;color:#404040;'> uhd: add patch to fix method deprecated in Boost 1.47.0 and removed in Boost 1.66.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> "native" -> "native_handle"
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> do not rev-bump, since it's unnecessary at this point
</span>---
science/uhd/Portfile | 6 ++
.../uhd/files/patch-boost_use_native_handle.diff | 88 ++++++++++++++++++++++
2 files changed, 94 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/uhd/Portfile b/science/uhd/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4cb9ef6..62fc48e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/uhd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/uhd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,6 +32,12 @@ Provides the release version, which is typically updated every month or so.
</span>
set UHD_VERSION_INFO "Release"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # make uhd compatible with Boost 1.66.0, which removed a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # deprecated method; use the replacement instead.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-boost_use_native_handle.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # overload the github livecheck regex to look for versions that
# are just numbers and '_', no letters (e.g., "3.7.3_rc2").
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/uhd/files/patch-boost_use_native_handle.diff b/science/uhd/files/patch-boost_use_native_handle.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..7fd8901
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/uhd/files/patch-boost_use_native_handle.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,88 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 282a580..362ce79 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/host/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/host/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -270,7 +270,7 @@ IF(MSVC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ENDIF(MSVC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET(Boost_ADDITIONAL_VERSIONS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "1.46.0" "1.46" "1.47.0" "1.47" "1.48.0" "1.48" "1.48.0" "1.49" "1.50.0" "1.50"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "1.47.0" "1.47" "1.48.0" "1.48" "1.48.0" "1.49" "1.50.0" "1.50"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "1.51.0" "1.51" "1.52.0" "1.52" "1.53.0" "1.53" "1.54.0" "1.54" "1.55.0" "1.55"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "1.56.0" "1.56" "1.57" "1.57" "1.58" "1.59" "1.60" "1.61"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/host/examples/network_relay.cpp b/host/examples/network_relay.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 7e35493..84040b5 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/host/examples/network_relay.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/host/examples/network_relay.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -127,7 +127,7 @@ private:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ wait_for_thread.notify_one(); // notify constructor that this thread has started
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ std::vector<char> buff(insane_mtu);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ while (not boost::this_thread::interruption_requested()){
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (wait_for_recv_ready(_server_socket->native())){
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (wait_for_recv_ready(_server_socket->native_handle())){
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ boost::mutex::scoped_lock lock(_endpoint_mutex);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const size_t len = _server_socket->receive_from(asio::buffer(&buff.front(), buff.size()), _endpoint);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lock.unlock();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -153,7 +153,7 @@ private:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ wait_for_thread.notify_one(); // notify constructor that this thread has started
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ std::vector<char> buff(insane_mtu);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ while (not boost::this_thread::interruption_requested()){
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (wait_for_recv_ready(_client_socket->native())){
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (wait_for_recv_ready(_client_socket->native_handle())){
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const size_t len = _client_socket->receive(asio::buffer(&buff.front(), buff.size()));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ boost::mutex::scoped_lock lock(_endpoint_mutex);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _server_socket->send_to(asio::buffer(&buff.front(), len), _endpoint);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/host/lib/transport/tcp_zero_copy.cpp b/host/lib/transport/tcp_zero_copy.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index f2ae516..9347772 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/host/lib/transport/tcp_zero_copy.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/host/lib/transport/tcp_zero_copy.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -154,7 +154,7 @@ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //create, open, and connect the socket
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _socket.reset(new asio::ip::tcp::socket(_io_service));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _socket->connect(receiver_endpoint);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _sock_fd = _socket->native();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ _sock_fd = _socket->native_handle();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //packets go out ASAP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ asio::ip::tcp::no_delay option(true);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/host/lib/transport/udp_simple.cpp b/host/lib/transport/udp_simple.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0a93941..bbbcd18 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/host/lib/transport/udp_simple.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/host/lib/transport/udp_simple.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -56,7 +56,8 @@ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size_t recv(const asio::mutable_buffer &buff, double timeout){
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (not wait_for_recv_ready(_socket->native(), timeout)) return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (not wait_for_recv_ready(_socket->native_handle(), timeout))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return _socket->receive_from(asio::buffer(buff), _recv_endpoint);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/host/lib/transport/udp_zero_copy.cpp b/host/lib/transport/udp_zero_copy.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 63044c1..944cc1e 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/host/lib/transport/udp_zero_copy.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/host/lib/transport/udp_zero_copy.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -190,7 +190,7 @@ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _socket = socket_sptr(new asio::ip::udp::socket(_io_service));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _socket->open(asio::ip::udp::v4());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _socket->connect(receiver_endpoint);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- _sock_fd = _socket->native();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ _sock_fd = _socket->native_handle();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //allocate re-usable managed receive buffers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (size_t i = 0; i < get_num_recv_frames(); i++){
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/host/lib/usrp/e300/e300_network.cpp b/host/lib/usrp/e300/e300_network.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index e68f2a5..7c7dc79 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/host/lib/usrp/e300/e300_network.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/host/lib/usrp/e300/e300_network.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -133,7 +133,7 @@ static void e300_send_tunnel(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (not buff) continue;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //step 2 - recv from socket
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- while (not wait_for_recv_ready(recver->native(), 100) and *running){}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ while (not wait_for_recv_ready(recver->native_handle(), 100) and *running){}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (not *running) break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const size_t num_bytes = recver->receive_from(asio::buffer(buff->cast<void *>(), buff->size()), _rx_endpoint);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (E300_NETWORK_DEBUG) UHD_MSG(status) << name << " got " << num_bytes << std::endl;
</span></pre><pre style='margin:0'>
</pre>