<!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>[120367] trunk/dports/science/gnuradio</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/120367">120367</a></dd>
<dt>Author</dt> <dd>michaelld@macports.org</dd>
<dt>Date</dt> <dd>2014-05-24 13:32:21 -0700 (Sat, 24 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>gnuradio: update devel to 5cb67ced and next to 22b01e37, both 20140523.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportssciencegnuradioPortfile">trunk/dports/science/gnuradio/Portfile</a></li>
<li><a href="#trunkdportssciencegnuradiofilespatchcmakeexpanddeveldiff">trunk/dports/science/gnuradio/files/patch-cmake-expand.devel.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportssciencegnuradioPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/gnuradio/Portfile (120366 => 120367)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/gnuradio/Portfile 2014-05-24 19:37:45 UTC (rev 120366)
+++ trunk/dports/science/gnuradio/Portfile 2014-05-24 20:32:21 UTC (rev 120367)
</span><span class="lines">@@ -93,16 +93,15 @@
</span><span class="cx"> long_description ${description}: \
</span><span class="cx"> This port is kept up with the GNU Radio GIT 'master' branch, which is typically updated daily to weekly. This version of GNU Radio generally contains fixes to, and its API is compatible with, the current GNU Radio release, and will be incorporated in an upcoming release. This port may or not compile or function correctly, as it represents a work in progress. If it does not work, check back in a few days. Or try deactivating the currently active gnuradio port, cleaning any current builds, and trying again.
</span><span class="cx">
</span><del>- github.setup gnuradio gnuradio cba2d184e2abb8a52353929a34b562ea4f9bd031
- version 3.7.4_20140520
- revision 1
</del><ins>+ github.setup gnuradio gnuradio 5cb67ced9b0735a6a7d0782c801ea0604153bef2
+ version 3.7.4_20140523
</ins><span class="cx"> name gnuradio-devel
</span><span class="cx">
</span><span class="cx"> conflicts gnuradio-legacy gnuradio gnuradio-next
</span><span class="cx">
</span><span class="cx"> checksums \
</span><del>- rmd160 673aa98e4a5cc9b2340c56bfacddafacca7755bc \
- sha256 0d8e006c086a9421798aa7d2b481e147d3b5919e44645689ceda50620610c9c2
</del><ins>+ rmd160 bd683883b6d2d2202ec10d7ddbd1bc5c42e626f2 \
+ sha256 fbb481a15e8238a05eefd36b7cc6eb77500f3b40a88cb5dd9bfce350dc2c1431
</ins><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -111,16 +110,15 @@
</span><span class="cx"> long_description ${description}: \
</span><span class="cx"> This port is kept up with the GNU Radio GIT 'next' branch, which is typically updated daily to weekly. This version of GNU Radio represents the next major release of GNU Radio, and hence its API is likely to be different than that provided by either gnuradio or gnuradio-devel. This port may or not compile or function correctly, as it represents a work in progress. If it does not work, check back in a few days. Or try deactivating the currently active gnuradio port, cleaning any current builds, and trying again.
</span><span class="cx">
</span><del>- github.setup gnuradio gnuradio c38322bea953f6c33b530ea3b171eb3bcc39d916
- version 3.8.0_20140520
- revision 1
</del><ins>+ github.setup gnuradio gnuradio 22b01e3722fe8e7890ecb188f4ec6cfd3a5531c2
+ version 3.8.0_20140523
</ins><span class="cx"> name gnuradio-next
</span><span class="cx">
</span><span class="cx"> conflicts gnuradio-legacy gnuradio gnuradio-devel
</span><span class="cx">
</span><span class="cx"> checksums \
</span><del>- rmd160 c0ef14a81db958e22743a78d2d4ff1352b4327e8 \
- sha256 01cb26c48b1f95152d2eb4c49881148db6ec03b13be499f558a0a729e99f4775
</del><ins>+ rmd160 be6907c87e18cacc021658a3158f7824f90aecb5 \
+ sha256 e9099946ba45bdb2e53e563309362c7c798503a04e31c7062f6a7883212bc1fb
</ins><span class="cx">
</span><span class="cx"> # overload the github livecheck URL with the correct branch
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportssciencegnuradiofilespatchcmakeexpanddeveldiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/gnuradio/files/patch-cmake-expand.devel.diff (120366 => 120367)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/gnuradio/files/patch-cmake-expand.devel.diff 2014-05-24 19:37:45 UTC (rev 120366)
+++ trunk/dports/science/gnuradio/files/patch-cmake-expand.devel.diff 2014-05-24 20:32:21 UTC (rev 120367)
</span><span class="lines">@@ -371,7 +371,7 @@
</span><span class="cx"> # Setup library
</span><span class="cx"> --- gr-blocks/include/gnuradio/blocks/CMakeLists.txt.orig
</span><span class="cx"> +++ gr-blocks/include/gnuradio/blocks/CMakeLists.txt
</span><del>-@@ -18,80 +18,37 @@
</del><ins>+@@ -18,81 +18,38 @@
</ins><span class="cx"> # Boston, MA 02110-1301, USA.
</span><span class="cx">
</span><span class="cx"> ########################################################################
</span><span class="lines">@@ -444,6 +444,7 @@
</span><span class="cx"> -expand_h(probe_signal_vX b s i f c)
</span><span class="cx"> -expand_h(sample_and_hold_XX bb ss ii ff)
</span><span class="cx"> -expand_h(sub_XX ss ii ff cc)
</span><ins>+-expand_h(tsb_vector_sink_X b s i f c)
</ins><span class="cx"> -expand_h(xor_XX bb ss ii)
</span><span class="cx"> -expand_h(packed_to_unpacked_XX bb ss ii)
</span><span class="cx"> -expand_h(unpacked_to_packed_XX bb ss ii)
</span><span class="lines">@@ -473,6 +474,7 @@
</span><span class="cx"> +GR_EXPAND_X_H(blocks probe_signal_vX b s i f c)
</span><span class="cx"> +GR_EXPAND_X_H(blocks sample_and_hold_XX bb ss ii ff)
</span><span class="cx"> +GR_EXPAND_X_H(blocks sub_XX ss ii ff cc)
</span><ins>++GR_EXPAND_X_H(blocks tsb_vector_sink_X b s i f c)
</ins><span class="cx"> +GR_EXPAND_X_H(blocks xor_XX bb ss ii)
</span><span class="cx"> +GR_EXPAND_X_H(blocks packed_to_unpacked_XX bb ss ii)
</span><span class="cx"> +GR_EXPAND_X_H(blocks unpacked_to_packed_XX bb ss ii)
</span><span class="lines">@@ -484,7 +486,7 @@
</span><span class="cx"> ${generated_includes}
</span><span class="cx"> --- gr-blocks/lib/CMakeLists.txt.orig
</span><span class="cx"> +++ gr-blocks/lib/CMakeLists.txt
</span><del>-@@ -23,101 +23,37 @@
</del><ins>+@@ -23,102 +23,38 @@
</ins><span class="cx"> include(${CMAKE_CURRENT_SOURCE_DIR}/ConfigChecks.cmake)
</span><span class="cx">
</span><span class="cx"> ########################################################################
</span><span class="lines">@@ -576,6 +578,7 @@
</span><span class="cx"> -expand_cc_h_impl(probe_signal_X b s i f c)
</span><span class="cx"> -expand_cc_h_impl(probe_signal_vX b s i f c)
</span><span class="cx"> -expand_cc_h_impl(sample_and_hold_XX bb ss ii ff)
</span><ins>+-expand_cc_h_impl(tsb_vector_sink_X b s i f c)
</ins><span class="cx"> -expand_cc_h_impl(sub_XX ss ii ff cc)
</span><span class="cx"> -expand_cc_h_impl(xor_XX bb ss ii)
</span><span class="cx"> -expand_cc_h_impl(packed_to_unpacked_XX bb ss ii)
</span><span class="lines">@@ -606,6 +609,7 @@
</span><span class="cx"> +GR_EXPAND_X_CC_H_IMPL(blocks probe_signal_vX b s i f c)
</span><span class="cx"> +GR_EXPAND_X_CC_H_IMPL(blocks sample_and_hold_XX bb ss ii ff)
</span><span class="cx"> +GR_EXPAND_X_CC_H_IMPL(blocks sub_XX ss ii ff cc)
</span><ins>++GR_EXPAND_X_CC_H_IMPL(blocks tsb_vector_sink_X b s i f c)
</ins><span class="cx"> +GR_EXPAND_X_CC_H_IMPL(blocks xor_XX bb ss ii)
</span><span class="cx"> +GR_EXPAND_X_CC_H_IMPL(blocks packed_to_unpacked_XX bb ss ii)
</span><span class="cx"> +GR_EXPAND_X_CC_H_IMPL(blocks unpacked_to_packed_XX bb ss ii)
</span></span></pre>
</div>
</div>
</body>
</html>