<!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>[139902] 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/139902">139902</a></dd>
<dt>Author</dt> <dd>michaelld@macports.org</dd>
<dt>Date</dt> <dd>2015-09-01 08:41:08 -0700 (Tue, 01 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>uhd:
+ update release to 3.9.0;
+ update devel to d697bff4 (20150831);
+ add temporary patch telling the user about detecting a bad USB state on startup & resetting it.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsscienceuhdPortfile">trunk/dports/science/uhd/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/dports/science/uhd/files/</li>
<li><a href="#trunkdportsscienceuhdfilespatchb200_fixesdiff">trunk/dports/science/uhd/files/patch-b200_fixes.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 (139901 => 139902)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/uhd/Portfile 2015-09-01 15:03:15 UTC (rev 139901)
+++ trunk/dports/science/uhd/Portfile 2015-09-01 15:41:08 UTC (rev 139902)
</span><span class="lines">@@ -22,13 +22,12 @@
</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.5
</del><ins>+ set base_version 3.9.0
</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 b571195eefc2a45fda31b1c466498ff146a76d62 \
- sha256 1b50adf39dab2a829998168f272319c4581ea1803dcb06bf462e70ba60e4abd1
</del><ins>+ checksums rmd160 c71e795a7e60bd6de0167b6e703e8386eda43383 \
+ sha256 794cb9240b406a7862282d2202467c98140e017d0ea9d8aa8e0544e95821bbe4
</ins><span class="cx">
</span><span class="cx"> # set the version override string
</span><span class="cx">
</span><span class="lines">@@ -48,10 +47,10 @@
</span><span class="cx">
</span><span class="cx"> name uhd-devel
</span><span class="cx"> conflicts uhd
</span><del>- github.setup EttusResearch uhd 719859693a794198dd27c46c119d16783abacd31
- version 20150818
- checksums rmd160 857394f63b5489d0e81843b4e38a844a9278d4ec \
- sha256 29fb36b3426d5e777e4b6de2f781ee340facc96cfdfd62a829eedb60a52b4b14
</del><ins>+ github.setup EttusResearch uhd d697bff4547b6a7fb95e127ec12e2989fc6fc2e5
+ version 20150831
+ checksums rmd160 4256f545515c8e888587bec44b735130c72d1926 \
+ sha256 c234ddaef4d6776087540e3ce96429c54a776b216465a0a53fbbb4063edf3b47
</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">@@ -72,6 +71,11 @@
</span><span class="cx">
</span><span class="cx"> depends_build-append port:pkgconfig
</span><span class="cx">
</span><ins>+# temporary patch telling the user about detecting a bad USB state on
+# startup & resetting it.
+
+patchfiles-append patch-b200_fixes.diff
+
</ins><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="trunkdportsscienceuhdfilespatchb200_fixesdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/science/uhd/files/patch-b200_fixes.diff (0 => 139902)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/uhd/files/patch-b200_fixes.diff (rev 0)
+++ trunk/dports/science/uhd/files/patch-b200_fixes.diff 2015-09-01 15:41:08 UTC (rev 139902)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+--- host/lib/usrp/b200/b200_impl.cpp.orig
++++ host/lib/usrp/b200/b200_impl.cpp
+@@ -259,6 +259,7 @@
+ return device::sptr(new b200_impl(device_addr, handle));
+ }
+ catch (const uhd::usb_error &e) {
++ UHD_MSG(status) << "Detected bad USB state; resetting USB." << std::endl;
+ libusb::device_handle::sptr dev_handle(libusb::device_handle::get_cached_handle(
+ boost::static_pointer_cast<libusb::special_handle>(handle)->get_device()
+ ));
</ins></span></pre>
</div>
</div>
</body>
</html>