<!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>[122427] 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/122427">122427</a></dd>
<dt>Author</dt> <dd>michaelld@macports.org</dd>
<dt>Date</dt> <dd>2014-07-22 13:04:48 -0700 (Tue, 22 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>gnuradio: update gnuradio-devel to d09b971d and next to ad17b61b, both 20140721.</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 (122426 => 122427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/gnuradio/Portfile 2014-07-22 19:09:37 UTC (rev 122426)
+++ trunk/dports/science/gnuradio/Portfile 2014-07-22 20:04:48 UTC (rev 122427)
</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 c98699ee1492e3899fad68e54537953f7d440b10
- version 3.7.4_20140629
</del><ins>+ github.setup gnuradio gnuradio d09b971d01f4e65eff80065796d724d88168866d
+ version 3.7.4_20140721
</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 d51d266b61225c85314c12df58ee597ddded7ead \
- sha256 49a96f45a6f8fe52c2eb9bcf0150724b0060e7e9a4e11ca90954425d29b6148e
</del><ins>+ rmd160 ad4f426e7a27056808358a7a22f494d0c5279a90 \
+ sha256 7ebef46c99b1d193197a95a9e6063db2b2c7a0f1821eb42ea05b535e68f254f6
</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 877c507ae03447625fb6979e37a5a24e152f8462
- version 3.8.0_20140629
</del><ins>+ github.setup gnuradio gnuradio ad17b61b2bea012b30078e0b0a691696df17cd8a
+ version 3.8.0_20140721
</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 22c6f449292dc7527ba8612e9ce48ad887ef638d \
- sha256 e02270e73c97d1a2fde5628de1b769fcdbcdca429644010eebd7d7d1fbde529e
</del><ins>+ rmd160 d35116bc9aa3c94b2f8ba5045f0193f099abfff7 \
+ sha256 8f2678dfb09a9538308889d570b6ce3b31bc778167a87339fcfea68ec90dd269
</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 (122426 => 122427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/gnuradio/files/patch-cmake-expand.devel.diff 2014-07-22 19:09:37 UTC (rev 122426)
+++ trunk/dports/science/gnuradio/files/patch-cmake-expand.devel.diff 2014-07-22 20:04:48 UTC (rev 122427)
</span><span class="lines">@@ -1,14 +1,5 @@
</span><span class="cx"> --- cmake/Modules/GrMiscUtils.cmake.orig
</span><span class="cx"> +++ cmake/Modules/GrMiscUtils.cmake
</span><del>-@@ -333,7 +333,7 @@ set(CMAKE_REQUIRED_LIBRARIES -lpthread)
- } " HAVE_PTHREAD_SETSCHEDPARAM
- )
- GR_ADD_COND_DEF(HAVE_PTHREAD_SETSCHEDPARAM)
--
-+
- CHECK_CXX_SOURCE_COMPILES("
- #include <sched.h>
- int main(){
</del><span class="cx"> @@ -345,3 +345,210 @@ set(CMAKE_REQUIRED_LIBRARIES -lpthread)
</span><span class="cx"> GR_ADD_COND_DEF(HAVE_SCHED_SETSCHEDULER)
</span><span class="cx"> endmacro(GR_CHECK_LINUX_SCHED_AVAIL)
</span><span class="lines">@@ -233,7 +224,8 @@
</span><span class="cx">
</span><span class="cx"> ########################################################################
</span><span class="cx"> -# generate helper scripts to expand templated files
</span><del>--########################################################################
</del><ins>++# Invoke macro to generate various headers
+ ########################################################################
</ins><span class="cx"> -include(GrPython)
</span><span class="cx"> -
</span><span class="cx"> -file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py "
</span><span class="lines">@@ -261,7 +253,7 @@
</span><span class="cx"> - string(REGEX REPLACE "X+" ${sig} name ${root})
</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 files
</span><span class="cx"> - add_custom_command(
</span><span class="cx"> - OUTPUT ${expanded_files_h}
</span><span class="lines">@@ -277,8 +269,7 @@
</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 headers
- #######################################################################
</del><ins>+-#######################################################################
</ins><span class="cx"> -expand_h(noise_source_X s i f c)
</span><span class="cx"> -expand_h(fastnoise_source_X s i f c)
</span><span class="cx"> -expand_h(sig_source_X s i f c)
</span><span class="lines">@@ -987,7 +978,8 @@
</span><span class="cx">
</span><span class="cx"> ########################################################################
</span><span class="cx"> -# generate helper scripts to expand templated files
</span><del>--########################################################################
</del><ins>++# Invoke macro to generate various headers
+ ########################################################################
</ins><span class="cx"> -include(GrPython)
</span><span class="cx"> -
</span><span class="cx"> -file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py "
</span><span class="lines">@@ -1015,7 +1007,7 @@
</span><span class="cx"> - string(REGEX REPLACE "X+" ${sig} name ${root})
</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 files
</span><span class="cx"> - add_custom_command(
</span><span class="cx"> - OUTPUT ${expanded_files_h}
</span><span class="lines">@@ -1031,8 +1023,7 @@
</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 headers
- #######################################################################
</del><ins>+-#######################################################################
</ins><span class="cx"> -expand_h(encoder_XX bb bs bi ss si ii)
</span><span class="cx"> -expand_h(sccc_encoder_XX bb bs bi ss si ii)
</span><span class="cx"> -expand_h(pccc_encoder_XX bb bs bi ss si ii)
</span></span></pre>
</div>
</div>
</body>
</html>