<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[135288] trunk/dports/science/uhd</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/135288">135288</a></dd>
<dt>Author</dt> <dd>michaelld@macports.org</dd>
<dt>Date</dt> <dd>2015-04-22 06:36:22 -0700 (Wed, 22 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>uhd:
+ update release to 3.8.3;
+ move boost 1.58 fix patch to be just for the release;
+ update devel to da800edf (20150421).</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsscienceuhdPortfile">trunk/dports/science/uhd/Portfile</a></li>
<li><a href="#trunkdportsscienceuhdfilespatchboost158diff">trunk/dports/science/uhd/files/patch-boost-1.58.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsscienceuhdPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/uhd/Portfile (135287 => 135288)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/uhd/Portfile 2015-04-22 12:55:07 UTC (rev 135287)
+++ trunk/dports/science/uhd/Portfile 2015-04-22 13:36:22 UTC (rev 135288)
</span><span class="lines">@@ -21,18 +21,21 @@
</span><span class="cx"> long_description ${description}: \
</span><span class="cx"> Provides the release version, which is typically updated every month or so.
</span><span class="cx">
</span><del>- set base_version 3.8.2
</del><ins>+ set base_version 3.8.3
</ins><span class="cx"> github.setup EttusResearch uhd 00[join [split ${base_version} "."] "_00"] release_
</span><span class="cx"> version ${base_version}
</span><del>- revision 1
</del><span class="cx"> conflicts uhd-devel
</span><del>- checksums rmd160 5098bd64786f7e1b2adde1fc2b61466914dc1863 \
- sha256 589dc4498164954108b4ca2d90ebefe01806e4a33942bd9ae24a3b960c2d9b44
</del><ins>+ checksums rmd160 1e026b8480c820ac36c53feb3f7e8b4fc10cae34 \
+ sha256 c1c0d34dcdd8bc77ab2e853b347efd6db2b1ae777705b623631a552d5edfa251
</ins><span class="cx">
</span><span class="cx"> # set the version override string
</span><span class="cx">
</span><span class="cx"> set UHD_VERSION_INFO "Release"
</span><span class="cx">
</span><ins>+ # patch to fix building using Boost 1.58+
+
+ patchfiles-append patch-boost-1.58.diff
+
</ins><span class="cx"> # overload the github livecheck regex to look for versions that
</span><span class="cx"> # are just numbers and '_', no letters (e.g., "3.7.3_rc2").
</span><span class="cx">
</span><span class="lines">@@ -47,10 +50,10 @@
</span><span class="cx">
</span><span class="cx"> name uhd-devel
</span><span class="cx"> conflicts uhd
</span><del>- github.setup EttusResearch uhd 2f760ac0f883e1de9adca48449498deab72a9359
- version 20150414
- checksums rmd160 8184d0c3eeef823eff4642b85b2988b4e0ec05fd \
- sha256 1e4c5a19d36895fffd9357ab7a0c109c4fe5fbb6143ae218e82b16f021673e05
</del><ins>+ github.setup EttusResearch uhd da800edf099db2adcb6b2fd4038cc6d15cdaf57f
+ version 20150421
+ checksums rmd160 f7e738aed8af9be6a432509e0241413fefd208be \
+ sha256 4f8e3baba0e7a6cd996203a023bd7e7de43ee027512f55e2f0ee3ec5e636bfd7
</ins><span class="cx">
</span><span class="cx"> # overload the github livecheck URL with the maint branch,
</span><span class="cx"> # when it is more advanced; comment out for master.
</span><span class="lines">@@ -71,10 +74,6 @@
</span><span class="cx">
</span><span class="cx"> depends_build-append port:pkgconfig
</span><span class="cx">
</span><del>-# temporary patch to fix building with Boost 1.58
-
-patchfiles-append patch-boost-1.58.diff
-
</del><span class="cx"> # do VPATH (out of source tree) build
</span><span class="cx">
</span><span class="cx"> cmake.out_of_source yes
</span></span></pre></div>
<a id="trunkdportsscienceuhdfilespatchboost158diff"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/uhd/files/patch-boost-1.58.diff (135287 => 135288)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/uhd/files/patch-boost-1.58.diff 2015-04-22 12:55:07 UTC (rev 135287)
+++ trunk/dports/science/uhd/files/patch-boost-1.58.diff 2015-04-22 13:36:22 UTC (rev 135288)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> --- host/lib/usrp/b200/b200_io_impl.cpp.orig
</span><span class="cx"> +++ host/lib/usrp/b200/b200_io_impl.cpp
</span><del>-@@ -300,7 +300,7 @@ boost::optional<uhd::msg_task::msg_type_t> b200_impl::handle_async_task(
</del><ins>+@@ -194,7 +194,7 @@ boost::optional<uhd::msg_task::msg_type_t> b200_impl::handle_async_task(
</ins><span class="cx"> {
</span><span class="cx"> managed_recv_buffer::sptr buff = xport->get_recv_buff();
</span><span class="cx"> if (not buff or buff->size() < 8)
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx">
</span><span class="cx"> const boost::uint32_t sid = uhd::wtohx(buff->cast<const boost::uint32_t *>()[1]);
</span><span class="cx"> switch (sid) {
</span><del>-@@ -364,7 +364,7 @@ boost::optional<uhd::msg_task::msg_type_t> b200_impl::handle_async_task(
</del><ins>+@@ -258,7 +258,7 @@ boost::optional<uhd::msg_task::msg_type_t> b200_impl::handle_async_task(
</ins><span class="cx"> default:
</span><span class="cx"> UHD_MSG(error) << "Got a ctrl packet with unknown SID " << sid << std::endl;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>