<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/26ae8291d19860c60b7252ed297e4bd6522bd18b">https://github.com/macports/macports-ports/commit/26ae8291d19860c60b7252ed297e4bd6522bd18b</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 26ae829  uhd-devel: update to 3a58a5f0 (20180116).
</span>26ae829 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 26ae8291d19860c60b7252ed297e4bd6522bd18b
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Sun Jan 21 14:17:28 2018 -0500

<span style='display:block; white-space:pre;color:#404040;'>    uhd-devel: update to 3a58a5f0 (20180116).
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    temporarily patch to fix compatibility with Boost 1.66.0 (and prior back to at least 1.46.0) as well as testing.
</span>---
 science/uhd/Portfile                               | 17 ++++++++---
 .../patch-cmake_Modules_UHDUnitTest.cmake.diff     | 20 +++++++++++++
 science/uhd/files/patch-fix-boost_asio_strand.diff | 33 ++++++++++++++++++++++
 3 files changed, 66 insertions(+), 4 deletions(-)

<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 7173a77..95fa047 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;'>@@ -52,10 +52,10 @@ Provides the UHD GIT maint or master branch, depending on which is more advanced
</span> 
     name            uhd-devel
     conflicts       uhd
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    github.setup    EttusResearch uhd fc8cd827f6b16b9c8c354a216889e6a9d7f37456
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    version         20171222
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    checksums       rmd160 a149f5c7a76d7753516cd1b75a135ff78de5966a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256 3d41a6dc534029109262508f66b2115c2cfaeb54b7eeb253faf10fe127429856
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    github.setup    EttusResearch uhd 3a58a5f03c3c69fecb21d24645bf1211b531c781
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    version         20180116
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    checksums       rmd160 d51130d7047f9cb0bf797f7bc3b1eb8e521a3e8a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256 afc3b38b7dd72ad98d397b188d2974baf489c0562b31738967db56ce4df45434
</span> 
     # overload the github livecheck URL with the maint branch,
     # when it is more advanced; comment out for master.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -66,6 +66,15 @@ Provides the UHD GIT maint or master branch, depending on which is more advanced
</span> 
     set UHD_VERSION_INFO "git-[string range ${github.version} 0 7](${version})"
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    # temporary patch to fix deprecated and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # replaced use of boost::asio::strand
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    patchfiles-append patch-fix-boost_asio_strand.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # temporary patch to fix test library path order such that any
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # local-to-build UHD library is found before any already-installed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # version, when Boost is installed in the same directory as UHD.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    patchfiles-append patch-cmake_Modules_UHDUnitTest.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> }
 
 # override the github Portgroup's homepage setting
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/uhd/files/patch-cmake_Modules_UHDUnitTest.cmake.diff b/science/uhd/files/patch-cmake_Modules_UHDUnitTest.cmake.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..92d37bb
</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-cmake_Modules_UHDUnitTest.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- host/cmake/Modules/UHDUnitTest.cmake.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ host/cmake/Modules/UHDUnitTest.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -18,15 +18,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         #directory itself.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         if(WIN32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             set(UHD_TEST_LIBRARY_DIRS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                "${Boost_LIBRARY_DIRS}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                 "${CMAKE_BINARY_DIR}/lib/${CMAKE_BUILD_TYPE}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                 "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                "${Boost_LIBRARY_DIRS}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             set(UHD_TEST_LIBRARY_DIRS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-                "${Boost_LIBRARY_DIRS}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                 "${CMAKE_BINARY_DIR}/lib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                 "${CMAKE_CURRENT_BINARY_DIR}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                "${Boost_LIBRARY_DIRS}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         endif(WIN32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/uhd/files/patch-fix-boost_asio_strand.diff b/science/uhd/files/patch-fix-boost_asio_strand.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..90ac4e3
</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-fix-boost_asio_strand.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,33 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- host/lib/deps/rpclib/include/rpc/detail/async_writer.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ host/lib/deps/rpclib/include/rpc/detail/async_writer.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -69,7 +69,7 @@ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ protected:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     boost::asio::ip::tcp::socket socket_;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    boost::asio::strand write_strand_;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    boost::asio::io_service::strand write_strand_;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     std::atomic_bool exit_{false};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     bool exited_ = false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     std::mutex m_exit_;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- host/lib/deps/rpclib/include/rpc/detail/server_session.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ host/lib/deps/rpclib/include/rpc/detail/server_session.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -35,7 +35,7 @@ private:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ private:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     server* parent_;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     boost::asio::io_service *io_;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    boost::asio::strand read_strand_;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    boost::asio::io_service::strand read_strand_;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     std::shared_ptr<dispatcher> disp_;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     RPCLIB_MSGPACK::unpacker pac_;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     RPCLIB_MSGPACK::sbuffer output_buf_;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- host/lib/deps/rpclib/lib/rpc/client.cc.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ host/lib/deps/rpclib/lib/rpc/client.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -133,7 +133,7 @@ struct client::impl {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     client *parent_;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     boost::asio::io_service io_;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    boost::asio::strand strand_;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    boost::asio::io_service::strand strand_;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     std::atomic<int> call_idx_; /// The index of the last call made
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     std::unordered_map<uint32_t, call_t> ongoing_calls_;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     std::string addr_;
</span></pre><pre style='margin:0'>

</pre>