<!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>[122520] 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/122520">122520</a></dd>
<dt>Author</dt> <dd>michaelld@macports.org</dd>
<dt>Date</dt> <dd>2014-07-23 07:29:55 -0700 (Wed, 23 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>gnuradio*:
+ update release to 3.7.4;
+ update devel to c580eacd and next to ad17b61b, both 20140722;
+ tweak patches for updates;
+ reorganize variants for new release capabilities;
+ move "name" to before "github.setup" since that now works.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportssciencegnuradioPortfile">trunk/dports/science/gnuradio/Portfile</a></li>
<li><a href="#trunkdportssciencegnuradiofilespatchcmakeexpandreleasediff">trunk/dports/science/gnuradio/files/patch-cmake-expand.release.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportssciencegnuradiofilespatchvarious10_5fixesreleasediff">trunk/dports/science/gnuradio/files/patch-various-10_5-fixes.release.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 (122519 => 122520)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/gnuradio/Portfile 2014-07-23 14:26:49 UTC (rev 122519)
+++ trunk/dports/science/gnuradio/Portfile 2014-07-23 14:29:55 UTC (rev 122520)
</span><span class="lines">@@ -22,8 +22,7 @@
</span><span class="cx">
</span><span class="cx"> if {${subport} eq ${name}} {
</span><span class="cx">
</span><del>- github.setup gnuradio gnuradio 3.7.3 v
- revision 2
</del><ins>+ github.setup gnuradio gnuradio 3.7.4 v
</ins><span class="cx">
</span><span class="cx"> long_description ${description}: \
</span><span class="cx"> This port is kept up with the GNU Radio release, currently ${version}, which is typically updated every few months.
</span><span class="lines">@@ -31,12 +30,9 @@
</span><span class="cx"> conflicts gnuradio-legacy gnuradio-next gnuradio-devel
</span><span class="cx">
</span><span class="cx"> checksums \
</span><del>- rmd160 5d1b3d03c96e0afd193407346f4f24ed4ed3907b \
- sha256 bec2eee034a525b268e14b2b2529d419313d36844f794f730f7176f75a52262f
</del><ins>+ rmd160 565f1a840502664e5a142cb314d566c243e0c584 \
+ sha256 960433dd098f6a536f1e04a10d5b2c5e9f1dbed17caa7130aa16165743b90489
</ins><span class="cx">
</span><del>- patchfiles-append \
- patch-cmake-expand.release.diff
-
</del><span class="cx"> # overload the github livecheck regex to look for versions that
</span><span class="cx"> # are just numbers and '.', no letters (e.g., "3.7.3git").
</span><span class="cx">
</span><span class="lines">@@ -46,8 +42,8 @@
</span><span class="cx">
</span><span class="cx"> subport gnuradio-legacy {
</span><span class="cx">
</span><del>- github.setup gnuradio gnuradio 3.6.5.1 v
</del><span class="cx"> name gnuradio-legacy
</span><ins>+ github.setup gnuradio gnuradio 3.6.5.1 v
</ins><span class="cx"> revision 8
</span><span class="cx">
</span><span class="cx"> long_description ${description}: \
</span><span class="lines">@@ -93,15 +89,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 d09b971d01f4e65eff80065796d724d88168866d
- version 3.7.4_20140721
</del><span class="cx"> name gnuradio-devel
</span><ins>+ github.setup gnuradio gnuradio c580eacd6edbef6e3566cef8737ba90c1f666847
+ version 3.7.5_20140722
</ins><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 ad4f426e7a27056808358a7a22f494d0c5279a90 \
- sha256 7ebef46c99b1d193197a95a9e6063db2b2c7a0f1821eb42ea05b535e68f254f6
</del><ins>+ rmd160 ea49ccc20e2567a89bd71cc42e8039596883e037 \
+ sha256 e2099b078abc204aff47e1c44ac5bc2e8d241191676e25005b61ecfb11221d50
</ins><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -110,15 +106,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 ad17b61b2bea012b30078e0b0a691696df17cd8a
- version 3.8.0_20140721
</del><span class="cx"> name gnuradio-next
</span><ins>+ github.setup gnuradio gnuradio 5a59c2ee321e5269068df60a7b880a2b0554eb00
+ version 3.8.0_20140722
</ins><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 d35116bc9aa3c94b2f8ba5045f0193f099abfff7 \
- sha256 8f2678dfb09a9538308889d570b6ce3b31bc778167a87339fcfea68ec90dd269
</del><ins>+ rmd160 167fb3af6b447106e44285eb42eb52635f410a02 \
+ sha256 f925a22e848b575101c62225a0e5aae356d6407ce7aaa2a964c6aa4fa507fd36
</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">@@ -137,6 +133,26 @@
</span><span class="cx">
</span><span class="cx"> patchfiles-append patch-remove-SIZE_T_32.diff
</span><span class="cx">
</span><ins>+ # temporary patch to fix header creation to be before dependencies
+ # are determined, such that local (to the build) headers are found
+ # before already-installed ones.
+
+ if {${subport} eq "gnuradio"} {
+
+ # patches for release only
+ patchfiles-append \
+ patch-cmake-expand.release.diff
+
+ } else {
+
+ # patches for devel and next (which are kept aligned for now)
+ patchfiles-append \
+ patch-cmake-expand.devel.diff
+
+ }
+
+ # 3.7 API variants
+
</ins><span class="cx"> variant ctrlport description {Enable control port enhancements (EXPERIMENTAL)} {}
</span><span class="cx">
</span><span class="cx"> if {[variant_isset ctrlport]} {
</span><span class="lines">@@ -164,38 +180,21 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if {${subport} ne "gnuradio"} {
</del><ins>+ variant zeromq description {Install GNU Radio with support for the ZeroMQ lightweight messaging kernel (EXPERIMENTAL)} {}
</ins><span class="cx">
</span><del>- # patches for devel and next (which are kept aligned for now)
</del><ins>+ if {[variant_isset zeromq]} {
</ins><span class="cx">
</span><del>- # temporary patch to fix header creation to be before dependencies
- # are determined, such that local (to the build) headers are found
- # before already-installed ones.
</del><ins>+ depends_lib-append \
+ port:cppzmq
</ins><span class="cx">
</span><del>- patchfiles-append patch-cmake-expand.devel.diff
</del><ins>+ configure.args-append \
+ -DENABLE_GR_ZEROMQ=ON
</ins><span class="cx">
</span><del>- # the zeromq variant is for devel and next only
- # until the next release
</del><ins>+ } else {
</ins><span class="cx">
</span><del>- variant zeromq description {Install GNU Radio with support for the ZeroMQ lightweight messaging kernel (EXPERIMENTAL)} {}
</del><ins>+ configure.args-append \
+ -DENABLE_GR_ZEROMQ=OFF
</ins><span class="cx">
</span><del>- if {[variant_isset zeromq]} {
-
- depends_lib-append \
- port:cppzmq
-
- configure.args-append \
- -DENABLE_GR_ZEROMQ=ON
-
- } else {
-
- configure.args-append \
- -DENABLE_GR_ZEROMQ=OFF
-
- }
- } else {
- # temporary patch until 3.7.4 is released
- patchfiles-append patch-various-10_5-fixes.release.diff
</del><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportssciencegnuradiofilespatchcmakeexpandreleasediff"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/gnuradio/files/patch-cmake-expand.release.diff (122519 => 122520)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/gnuradio/files/patch-cmake-expand.release.diff 2014-07-23 14:26:49 UTC (rev 122519)
+++ trunk/dports/science/gnuradio/files/patch-cmake-expand.release.diff 2014-07-23 14:29:55 UTC (rev 122520)
</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">@@ -326,7 +317,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 +335,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">@@ -371,7 +362,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,81 +18,38 @@
</ins><span class="cx"> # Boston, MA 02110-1301, USA.
</span><span class="cx">
</span><span class="cx"> ########################################################################
</span><span class="lines">@@ -379,7 +370,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 +396,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">@@ -444,6 +435,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 +465,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 +477,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">@@ -519,7 +512,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 +521,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 +530,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">@@ -576,6 +569,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 +600,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 class="lines">@@ -617,11 +612,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 +645,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 +676,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 +705,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 +723,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>-@@ -198,7 +138,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 +787,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 +816,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 class="lines">@@ -986,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">@@ -1014,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">@@ -1030,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 class="lines">@@ -1064,12 +1056,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">@@ -1099,7 +1091,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">@@ -1117,21 +1109,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>
<a id="trunkdportssciencegnuradiofilespatchvarious10_5fixesreleasediff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/science/gnuradio/files/patch-various-10_5-fixes.release.diff (122519 => 122520)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/gnuradio/files/patch-various-10_5-fixes.release.diff 2014-07-23 14:26:49 UTC (rev 122519)
+++ trunk/dports/science/gnuradio/files/patch-various-10_5-fixes.release.diff 2014-07-23 14:29:55 UTC (rev 122520)
</span><span class="lines">@@ -1,87 +0,0 @@
</span><del>---- gr-audio/lib/osx/osx_common.h.orig
-+++ gr-audio/lib/osx/osx_common.h
-@@ -35,9 +35,9 @@ namespace osx {
- #define check_error_and_throw(err,what,throw_str) \
- if(err) { \
- OSStatus error = static_cast<OSStatus>(err); \
-- char err_str[5]; \
-- *((UInt32*)err_str) = error; \
-- err_str[4] = 0; \
-+ char err_str[sizeof(OSStatus)+1]; \
-+ memcpy((void*)(&err_str), (void*)(&error), sizeof(OSStatus)); \
-+ err_str[sizeof(OSStatus)] = 0; \
- GR_LOG_FATAL(d_logger, boost::format(what)); \
- GR_LOG_FATAL(d_logger, boost::format(" Error# %u ('%s')") \
- % error % err_str); \
-@@ -49,9 +49,9 @@ namespace osx {
- #define check_error(err,what) \
- if(err) { \
- OSStatus error = static_cast<OSStatus>(err); \
-- char err_str[5]; \
-- *((UInt32*)err_str) = error; \
-- err_str[4] = 0; \
-+ char err_str[sizeof(OSStatus)+1]; \
-+ memcpy((void*)(&err_str), (void*)(&error), sizeof(OSStatus)); \
-+ err_str[sizeof(OSStatus)] = 0; \
- GR_LOG_WARN(d_logger, boost::format(what)); \
- GR_LOG_WARN(d_logger, boost::format(" Error# %u ('%s')") \
- % error % err_str); \
-commit aead6f76ab85755c5ae4e561f0560247eb8b2a97
-Author: Michael Dickens <mlk@alum.mit.edu>
-Date: Thu Jun 26 19:35:12 2014 -0400
-
- gr-audio OSX: fix call to AudioHardwareRemovePropertyListener to match API.
-
---- gr-audio/lib/osx/osx_source.cc.orig
-+++ gr-audio/lib/osx/osx_source.cc
-@@ -933,8 +933,7 @@ namespace gr {
- err = AudioHardwareRemovePropertyListener
- (kAudioHardwarePropertyDevices,
- reinterpret_cast<AudioHardwarePropertyListenerProc>
-- (&osx_source::hardware_listener)
-- reinterpret_cast<void*>(this));
-+ (&osx_source::hardware_listener));
- #if _OSX_AU_DEBUG_
- check_error(err, "AudioObjectRemovePropertyListener hardware");
- #endif
-@@ -943,8 +942,7 @@ namespace gr {
- err = AudioHardwareRemovePropertyListener
- (kAudioHardwarePropertyDefaultInputDevice,
- reinterpret_cast<AudioHardwarePropertyListenerProc>
-- (&osx_source::default_listener),
-- reinterpret_cast<void*>(this));
-+ (&osx_source::default_listener));
- #if _OSX_AU_DEBUG_
- check_error(err, "AudioObjectRemovePropertyListener default");
- #endif
-commit 3d76c05bca4efb8f3aa8187135986c28a4e7fae8
-Author: Michael Dickens <mlk@alum.mit.edu>
-Date: Thu Jun 26 20:33:35 2014 -0400
-
- volk cmake: if the CPU is not x86, eliminate all Intel SIMD.
-
---- volk/lib/CMakeLists.txt.orig
-+++ volk/lib/CMakeLists.txt
-@@ -205,6 +205,22 @@ if(${HAVE_AVX_CVTPI32_PS})
- add_definitions(-DHAVE_AVX_CVTPI32_PS)
- endif()
-
-+########################################################################
-+# if the CPU is not x86, eliminate all Intel SIMD
-+########################################################################
-+
-+if(NOT CPU_IS_x86)
-+ OVERRULE_ARCH(3dnow "Architecture is not x86 or x86_64")
-+ OVERRULE_ARCH(mmx "Architecture is not x86 or x86_64")
-+ OVERRULE_ARCH(sse "Architecture is not x86 or x86_64")
-+ OVERRULE_ARCH(sse2 "Architecture is not x86 or x86_64")
-+ OVERRULE_ARCH(sse3 "Architecture is not x86 or x86_64")
-+ OVERRULE_ARCH(ssse3 "Architecture is not x86 or x86_64")
-+ OVERRULE_ARCH(sse4_a "Architecture is not x86 or x86_64")
-+ OVERRULE_ARCH(sse4_1 "Architecture is not x86 or x86_64")
-+ OVERRULE_ARCH(sse4_2 "Architecture is not x86 or x86_64")
-+ OVERRULE_ARCH(avx "Architecture is not x86 or x86_64")
-+endif(NOT CPU_IS_x86)
-
- ########################################################################
- # implement overruling in the ORC case,
</del></span></pre>
</div>
</div>
</body>
</html>