<!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>[120306] 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/120306">120306</a></dd>
<dt>Author</dt> <dd>michaelld@macports.org</dd>
<dt>Date</dt> <dd>2014-05-22 08:58:03 -0700 (Thu, 22 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>gnuradio:
+ update devel to cba2d184 and next to c38322be, both 20140520;
+ add +zeromq variant and make it a default variant;
+ update cmake-expand patch for recent changes.</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 (120305 => 120306)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/gnuradio/Portfile 2014-05-22 14:20:43 UTC (rev 120305)
+++ trunk/dports/science/gnuradio/Portfile 2014-05-22 15:58:03 UTC (rev 120306)
</span><span class="lines">@@ -94,15 +94,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 432e3b75300a400e2e99dbe7e9aea58b6b2855b1
- version 3.7.4_20140509
</del><ins>+ github.setup gnuradio gnuradio cba2d184e2abb8a52353929a34b562ea4f9bd031
+ version 3.7.4_20140520
</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 01b3d29156e65cac97b8ee5763ffcd6d46f6aa5c \
- sha256 46b6af83ee25ff4e09c82ad28de5111766f8c59022063dabbe5e8533dd7d1431
</del><ins>+ rmd160 673aa98e4a5cc9b2340c56bfacddafacca7755bc \
+ sha256 0d8e006c086a9421798aa7d2b481e147d3b5919e44645689ceda50620610c9c2
</ins><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -111,15 +111,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 980669478a12667471366f7ddbe51fbf826f593b
- version 3.8.0_20140509
</del><ins>+ github.setup gnuradio gnuradio c38322bea953f6c33b530ea3b171eb3bcc39d916
+ version 3.8.0_20140520
</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 bdd5b2b9d3db5d5c2d91f2ddc374b1bc00bb19ce \
- sha256 7810abf3a37234a85079886908c239b9b99757e30de584ef6f6cc359aa438601
</del><ins>+ rmd160 c0ef14a81db958e22743a78d2d4ff1352b4327e8 \
+ sha256 01cb26c48b1f95152d2eb4c49881148db6ec03b13be499f558a0a729e99f4775
</ins><span class="cx">
</span><span class="cx"> # overload the github livecheck URL with the correct branch
</span><span class="cx">
</span><span class="lines">@@ -242,7 +242,7 @@
</span><span class="cx"> # (and, for next, except +ctrlport and +performance_counters);
</span><span class="cx">
</span><span class="cx"> default_variants +docs +grc +qtgui +wxgui +uhd +orc +wavelet \
</span><del>- +jack +portaudio +swig +sdl
</del><ins>+ +jack +portaudio +swig +sdl +zeromq
</ins><span class="cx">
</span><span class="cx"> # set Python variants
</span><span class="cx">
</span><span class="lines">@@ -587,3 +587,20 @@
</span><span class="cx"> -DSDL_INCLUDE_DIR=
</span><span class="cx">
</span><span class="cx"> }
</span><ins>+
+variant zeromq description "Install GNU Radio with support for the ZeroMQ lightweight messaging kernel" {
+
+ depends_lib-append \
+ port:cppzmq
+
+ configure.args-append \
+ -DENABLE_GR_ZEROMQ=ON
+
+}
+
+if {![variant_isset sdl]} {
+
+ configure.args-append \
+ -DENABLE_GR_ZEROMQ=OFF
+
+}
</ins></span></pre></div>
<a id="trunkdportssciencegnuradiofilespatchcmakeexpanddeveldiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/gnuradio/files/patch-cmake-expand.devel.diff (120305 => 120306)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/gnuradio/files/patch-cmake-expand.devel.diff 2014-05-22 14:20:43 UTC (rev 120305)
+++ trunk/dports/science/gnuradio/files/patch-cmake-expand.devel.diff 2014-05-22 15:58:03 UTC (rev 120306)
</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,38 @@
</del><ins>+@@ -18,80 +18,37 @@
</ins><span class="cx"> # Boston, MA 02110-1301, USA.
</span><span class="cx">
</span><span class="cx"> ########################################################################
</span><span class="lines">@@ -379,7 +379,7 @@
</span><span class="cx"> +# Invoke macro to generate various headers
</span><span class="cx"> ########################################################################
</span><span class="cx"> -include(GrPython)
</span><del>-
</del><ins>+-
</ins><span class="cx"> -file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py "
</span><span class="cx"> -#!${PYTHON_EXECUTABLE}
</span><span class="cx"> -
</span><span class="lines">@@ -405,7 +405,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">@@ -519,7 +519,7 @@
</span><span class="cx"> - list(APPEND expanded_files_h_impl ${CMAKE_CURRENT_BINARY_DIR}/${name}_impl.h)
</span><span class="cx"> - list(APPEND expanded_files_h ${CMAKE_CURRENT_BINARY_DIR}/../include/${name}.h)
</span><span class="cx"> - endforeach(sig)
</span><del>--
</del><ins>+-
</ins><span class="cx"> - #create a command to generate the _impl.cc files
</span><span class="cx"> - add_custom_command(
</span><span class="cx"> - OUTPUT ${expanded_files_cc_impl}
</span><span class="lines">@@ -528,7 +528,7 @@
</span><span class="cx"> - ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py
</span><span class="cx"> - ${root} ${root}_impl.cc.t ${ARGN}
</span><span class="cx"> - )
</span><del>--
</del><ins>+-
</ins><span class="cx"> - #create a command to generate the _impl.h files
</span><span class="cx"> - add_custom_command(
</span><span class="cx"> - OUTPUT ${expanded_files_h_impl}
</span><span class="lines">@@ -537,19 +537,19 @@
</span><span class="cx"> - ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py
</span><span class="cx"> - ${root} ${root}_impl.h.t ${ARGN}
</span><span class="cx"> - )
</span><del>--
</del><ins>+-
</ins><span class="cx"> - #make _impl.cc source files depend on headers to force generation
</span><span class="cx"> - set_source_files_properties(${expanded_files_cc_impl}
</span><span class="cx"> - PROPERTIES OBJECT_DEPENDS "${expanded_files_h_impl}"
</span><span class="cx"> - )
</span><del>--
</del><ins>+-
</ins><span class="cx"> - #make _impl.h source files depend on headers to force generation
</span><span class="cx"> - set_source_files_properties(${expanded_files_h_impl}
</span><span class="cx"> - PROPERTIES OBJECT_DEPENDS "${expanded_files_h}"
</span><span class="cx"> - )
</span><span class="cx"> -
</span><span class="cx"> - #install rules for the generated cc files
</span><del>-- list(APPEND generated_sources ${expanded_files_cc_impl})
</del><ins>+- list(APPEND generated_sources ${expanded_files_cc_impl})
</ins><span class="cx"> -endmacro(expand_cc_h_impl)
</span><span class="cx"> -
</span><span class="cx"> -########################################################################
</span><span class="lines">@@ -617,11 +617,9 @@
</span><span class="cx"> # Setup the include and linker paths
</span><span class="cx"> --- gr-digital/include/gnuradio/digital/CMakeLists.txt.orig
</span><span class="cx"> +++ gr-digital/include/gnuradio/digital/CMakeLists.txt
</span><del>-@@ -17,54 +17,12 @@
- # the Free Software Foundation, Inc., 51 Franklin Street,
</del><ins>+@@ -18,53 +18,10 @@
</ins><span class="cx"> # Boston, MA 02110-1301, USA.
</span><span class="cx">
</span><del>-+#################################################################
</del><span class="cx"> ########################################################################
</span><span class="cx"> -# generate helper scripts to expand templated files
</span><span class="cx"> -########################################################################
</span><span class="lines">@@ -652,7 +650,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">@@ -683,8 +681,7 @@
</span><span class="cx">
</span><span class="cx"> ########################################################################
</span><span class="cx"> -# generate helper scripts to expand templated files
</span><del>-+# Invoke macro to generate various sources and headers
- ########################################################################
</del><ins>+-########################################################################
</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">@@ -713,7 +710,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">@@ -731,28 +728,28 @@
</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"> -########################################################################
</span><del>--# Invoke macro to generate various sources
--########################################################################
</del><ins>+ # Invoke macro to generate various sources
+ ########################################################################
</ins><span class="cx"> -expand_cc(chunks_to_symbols_XX_impl bf bc sf sc if ic)
</span><span class="cx"> +include(GrMiscUtils)
</span><span class="cx"> +GR_EXPAND_X_CC_H(digital chunks_to_symbols_XX_impl bf bc sf sc if ic)
</span><span class="cx">
</span><span class="cx"> ########################################################################
</span><span class="cx"> # Setup library
</span><del>-@@ -200,7 +140,6 @@ list(APPEND digital_libs
</del><ins>+@@ -203,7 +143,6 @@ list(APPEND digital_libs
</ins><span class="cx"> ${LOG4CPP_LIBRARIES}
</span><span class="cx"> )
</span><span class="cx">
</span><span class="lines">@@ -795,7 +792,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">@@ -824,8 +821,8 @@
</span><span class="cx"> install(FILES
</span><span class="cx"> - ${generated_includes}
</span><span class="cx"> api.h
</span><del>- decode_ccsds_27_fb.h
- encode_ccsds_27_bb.h
</del><ins>+ generic_decoder.h
+ generic_encoder.h
</ins><span class="cx"> --- gr-filter/include/gnuradio/filter/CMakeLists.txt.orig
</span><span class="cx"> +++ gr-filter/include/gnuradio/filter/CMakeLists.txt
</span><span class="cx"> @@ -18,56 +18,13 @@
</span></span></pre>
</div>
</div>
</body>
</html>