<!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>[121566] 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/121566">121566</a></dd>
<dt>Author</dt> <dd>michaelld@macports.org</dd>
<dt>Date</dt> <dd>2014-06-30 09:41:55 -0700 (Mon, 30 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>gnuradio: update devel to c98699ee and next to 877c507a, both 20140629.</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 (121565 => 121566)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/gnuradio/Portfile 2014-06-30 14:56:26 UTC (rev 121565)
+++ trunk/dports/science/gnuradio/Portfile 2014-06-30 16:41:55 UTC (rev 121566)
</span><span class="lines">@@ -93,15 +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 9a7222577bc5425b17b513b94e0de73e847bd9da
- version 3.7.4_20140627
</del><ins>+ github.setup gnuradio gnuradio c98699ee1492e3899fad68e54537953f7d440b10
+ version 3.7.4_20140629
</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 0fc0ad863c748fababff3d94d30c8d1d1dedc03c \
- sha256 825b60af03876056061eea836ae8a298213efea2ca8a8f8f3f42519a6eb199ad
</del><ins>+ rmd160 d51d266b61225c85314c12df58ee597ddded7ead \
+ sha256 49a96f45a6f8fe52c2eb9bcf0150724b0060e7e9a4e11ca90954425d29b6148e
</ins><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -110,15 +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 3ddbfe5dc4616b8932208c0dd78e28b7b229992b
- version 3.8.0_20140627
</del><ins>+ github.setup gnuradio gnuradio 877c507ae03447625fb6979e37a5a24e152f8462
+ version 3.8.0_20140629
</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 3f6abad9d68a697795dffa098b09e31648cfbce5 \
- sha256 7694ad3a4f37ebbe1e2dbe436c99aa15995636485590a9a0b700827089dff5b9
</del><ins>+ rmd160 22c6f449292dc7527ba8612e9ce48ad887ef638d \
+ sha256 e02270e73c97d1a2fde5628de1b769fcdbcdca429644010eebd7d7d1fbde529e
</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 (121565 => 121566)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/gnuradio/files/patch-cmake-expand.devel.diff 2014-06-30 14:56:26 UTC (rev 121565)
+++ trunk/dports/science/gnuradio/files/patch-cmake-expand.devel.diff 2014-06-30 16:41:55 UTC (rev 121566)
</span><span class="lines">@@ -326,7 +326,7 @@
</span><span class="cx"> - list(APPEND expanded_files_cc ${CMAKE_CURRENT_BINARY_DIR}/${name}.cc)
</span><span class="cx"> - list(APPEND expanded_files_h ${CMAKE_CURRENT_BINARY_DIR}/${name}.h)
</span><span class="cx"> - endforeach(sig)
</span><del>--
</del><ins>+-
</ins><span class="cx"> - #create a command to generate the source files
</span><span class="cx"> - add_custom_command(
</span><span class="cx"> - OUTPUT ${expanded_files_cc}
</span><span class="lines">@@ -344,15 +344,15 @@
</span><span class="cx"> - ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py
</span><span class="cx"> - ${root} ${root}.h.t ${ARGN}
</span><span class="cx"> - )
</span><del>--
</del><ins>+-
</ins><span class="cx"> - #make source files depends on headers to force generation
</span><span class="cx"> - set_source_files_properties(${expanded_files_cc}
</span><span class="cx"> - PROPERTIES OBJECT_DEPENDS "${expanded_files_h}"
</span><span class="cx"> - )
</span><del>--
</del><ins>+-
</ins><span class="cx"> - #install rules for the generated cc files
</span><del>-- list(APPEND generated_sources ${expanded_files_cc})
-- list(APPEND generated_headers ${expanded_files_h})
</del><ins>+- list(APPEND generated_sources ${expanded_files_cc})
+- list(APPEND generated_headers ${expanded_files_h})
</ins><span class="cx"> -endmacro(expand_cc)
</span><span class="cx"> -
</span><span class="cx"> -
</span><span class="lines">@@ -1065,12 +1065,12 @@
</span><span class="cx"> #
</span><span class="cx"> # This file is part of GNU Radio
</span><span class="cx"> #
</span><del>-@@ -37,79 +37,20 @@ if(ENABLE_GR_CTRLPORT)
- include_directories(${ICE_INCLUDE_DIR})
</del><ins>+@@ -38,78 +38,19 @@ if(ENABLE_GR_CTRLPORT)
</ins><span class="cx"> endif(ENABLE_GR_CTRLPORT)
</span><span class="cx">
</span><del>--#######################################################################
</del><ins>+ #######################################################################
</ins><span class="cx"> -# generate the python helper script which calls into the build utils
</span><ins>++# Invoke macro to generate various sources and headers
</ins><span class="cx"> ########################################################################
</span><span class="cx"> -include(GrPython)
</span><span class="cx"> -
</span><span class="lines">@@ -1100,7 +1100,7 @@
</span><span class="cx"> - list(APPEND expanded_files_cc ${CMAKE_CURRENT_BINARY_DIR}/${name}.cc)
</span><span class="cx"> - list(APPEND expanded_files_h ${CMAKE_CURRENT_BINARY_DIR}/${name}.h)
</span><span class="cx"> - endforeach(sig)
</span><del>--
</del><ins>+-
</ins><span class="cx"> - #create a command to generate the source files
</span><span class="cx"> - add_custom_command(
</span><span class="cx"> - OUTPUT ${expanded_files_cc}
</span><span class="lines">@@ -1118,21 +1118,20 @@
</span><span class="cx"> - ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py
</span><span class="cx"> - ${root} ${root}.h.t ${ARGN}
</span><span class="cx"> - )
</span><del>--
</del><ins>+-
</ins><span class="cx"> - #make source files depends on headers to force generation
</span><span class="cx"> - set_source_files_properties(${expanded_files_cc}
</span><span class="cx"> - PROPERTIES OBJECT_DEPENDS "${expanded_files_h}"
</span><span class="cx"> - )
</span><del>--
</del><ins>+-
</ins><span class="cx"> - #install rules for the generated cc files
</span><del>-- list(APPEND generated_sources ${expanded_files_cc})
-- list(APPEND generated_headers ${expanded_files_h})
</del><ins>+- list(APPEND generated_sources ${expanded_files_cc})
+- list(APPEND generated_headers ${expanded_files_h})
</ins><span class="cx"> -endmacro(expand_cc)
</span><span class="cx"> -
</span><span class="cx"> -########################################################################
</span><span class="cx"> -# Invoke macro to generate various sources
</span><del>-+# Invoke macro to generate various sources and headers
- ########################################################################
</del><ins>+-########################################################################
</ins><span class="cx"> -expand_cc(encoder_XX_impl bb bs bi ss si ii)
</span><span class="cx"> -expand_cc(sccc_encoder_XX_impl bb bs bi ss si ii)
</span><span class="cx"> -expand_cc(pccc_encoder_XX_impl bb bs bi ss si ii)
</span></span></pre>
</div>
</div>
</body>
</html>