<!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>[139216] 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/139216">139216</a></dd>
<dt>Author</dt> <dd>michaelld@macports.org</dd>
<dt>Date</dt> <dd>2015-08-07 13:37:59 -0700 (Fri, 07 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>gnuradio:
+ update release to 3.7.8;
+ update devel to 22e2f1ae and release to 183dc9e9, both 20150805;
+ remove integrated patch.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportssciencegnuradioPortfile">trunk/dports/science/gnuradio/Portfile</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportssciencegnuradiofilespatchremoveSIZE_T_32diff">trunk/dports/science/gnuradio/files/patch-remove-SIZE_T_32.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 (139215 => 139216)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/gnuradio/Portfile 2015-08-07 17:07:25 UTC (rev 139215)
+++ trunk/dports/science/gnuradio/Portfile 2015-08-07 20:37:59 UTC (rev 139216)
</span><span class="lines">@@ -21,8 +21,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.7.1 v
- revision 1
</del><ins>+ github.setup gnuradio gnuradio 3.7.8 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">@@ -30,8 +29,8 @@
</span><span class="cx"> conflicts gnuradio-legacy gnuradio-next gnuradio-devel
</span><span class="cx">
</span><span class="cx"> checksums \
</span><del>- rmd160 18383f299f75ecc8d11345872b9991f7eb44f321 \
- sha256 461681cd7bdff80d07ba24c9b420f4ddcd5f869fc1c4ff671d2f155ff44d14ec
</del><ins>+ rmd160 8b56a2d372d967263470263344a281f16df20df2 \
+ sha256 e2db7cdb3231894e965540cec5930bfdbcaed952e0701e244fd72cb0961d3fef
</ins><span class="cx">
</span><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="lines">@@ -92,11 +91,11 @@
</span><span class="cx"> name gnuradio-devel
</span><span class="cx"> conflicts gnuradio-legacy gnuradio gnuradio-next
</span><span class="cx">
</span><del>- github.setup gnuradio gnuradio cf3f6a9b6dc51e20823990fb43d6fb4ec98691a5
- version 20150724
</del><ins>+ github.setup gnuradio gnuradio 22e2f1aed8afdfccce3884cf6bf3140c2b8e3f53
+ version 20150805
</ins><span class="cx"> checksums \
</span><del>- rmd160 6ace95b419f48fc913303d62f8e190a877d8f71a \
- sha256 2d2493d49aefc9df7bb96a30400f2d0570012a56b931afd4f5f1d813dcbf4392
</del><ins>+ rmd160 45c442a928f92a8c77476c562061665c02246ce9 \
+ sha256 9c8e8eeef143e1ffd23e8e88922b9269bab342a7b27cf4b615ce561d788cfaeb
</ins><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -108,11 +107,11 @@
</span><span class="cx"> name gnuradio-next
</span><span class="cx"> conflicts gnuradio-legacy gnuradio gnuradio-devel
</span><span class="cx">
</span><del>- github.setup gnuradio gnuradio 593e261d6ad4dbd1a45996a6e2f5df22df21091f
- version 20150724
</del><ins>+ github.setup gnuradio gnuradio 183dc9e9e18814beacb74bc7810a3a321e005522
+ version 20150805
</ins><span class="cx"> checksums \
</span><del>- rmd160 e1c8d95eebd5b4351b7b869d2ae777945da9e8e2 \
- sha256 cc7d17b5f866b803659defb4325dccf0f3155051b2859162a3c0ce7cb81282c3
</del><ins>+ rmd160 92d83bc9665cbf727709e0e808dbab3bd86b8806 \
+ sha256 7a3bef4d1d0eea14a44ff524a1c53ac075835cb6305f73e5af421fcc8c2a471f
</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">@@ -172,14 +171,6 @@
</span><span class="cx">
</span><span class="cx"> depends_lib-append port:log4cpp
</span><span class="cx">
</span><del>- # remove SIZE_T_32 check for SWIG; seems to help on older
- # 32/64 OSs; this is fixed for SWIG >= 3.0.0 in GNU Radio
- # devel and next as of 2015-04-28 (6277665c).
-
- if {${subport} eq "gnuradio"} {
- patchfiles-append patch-remove-SIZE_T_32.diff
- }
-
</del><span class="cx"> # temporary patch to fix header creation to be before dependencies
</span><span class="cx"> # are determined, such that local (to the build) headers are found
</span><span class="cx"> # before already-installed ones.
</span></span></pre></div>
<a id="trunkdportssciencegnuradiofilespatchremoveSIZE_T_32diff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/science/gnuradio/files/patch-remove-SIZE_T_32.diff (139215 => 139216)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/gnuradio/files/patch-remove-SIZE_T_32.diff 2015-08-07 17:07:25 UTC (rev 139215)
+++ trunk/dports/science/gnuradio/files/patch-remove-SIZE_T_32.diff 2015-08-07 20:37:59 UTC (rev 139216)
</span><span class="lines">@@ -1,39 +0,0 @@
</span><del>---- cmake/Modules/GrSwig.cmake.orig 2014-08-30 12:33:12.000000000 -0400
-+++ cmake/Modules/GrSwig.cmake 2014-09-01 08:37:32.000000000 -0400
-@@ -105,18 +105,6 @@
- macro(GR_SWIG_MAKE name)
- set(ifiles ${ARGN})
-
-- # Shimming this in here to take care of a SWIG bug with handling
-- # vector<size_t> and vector<unsigned int> (on 32-bit machines) and
-- # vector<long unsigned int> (on 64-bit machines). Use this to test
-- # the size of size_t, then set SIZE_T_32 if it's a 32-bit machine
-- # or not if it's 64-bit. The logic in gr_type.i handles the rest.
-- INCLUDE(CheckTypeSize)
-- CHECK_TYPE_SIZE("size_t" SIZEOF_SIZE_T)
-- CHECK_TYPE_SIZE("unsigned int" SIZEOF_UINT)
-- if(${SIZEOF_SIZE_T} EQUAL ${SIZEOF_UINT})
-- list(APPEND GR_SWIG_FLAGS -DSIZE_T_32)
-- endif(${SIZEOF_SIZE_T} EQUAL ${SIZEOF_UINT})
--
- #do swig doc generation if specified
- if(GR_SWIG_DOC_FILE)
- set(GR_SWIG_DOCS_SOURCE_DEPS ${GR_SWIG_SOURCE_DEPS})
---- gnuradio-runtime/swig/gr_types.i.orig
-+++ gnuradio-runtime/swig/gr_types.i
-@@ -80,15 +80,4 @@ namespace std {
- %template(gr_vector_vector_complexf) std::vector< std::vector< std::complex<float> > >;
- %template(gr_vector_vector_complexd) std::vector< std::vector< std::complex<double> > >;
-
--// Fix for Issue #529
--#ifdef SIZE_T_32
-- // On 32-bit systems, whenever we see std::vector<size_t>, replace it
-- // with vector<unsigned int>
-- %apply std::vector<unsigned int> { std::vector<size_t> };
--#else
-- // On 64-bit systems, whenever we see std::vector<size_t>, replace it
-- // with vector<long unsigned int>
-- %apply std::vector<long unsigned int> { std::vector<size_t> };
--#endif
--
- #endif /* SWIG_GR_TYPES_I */
</del></span></pre>
</div>
</div>
</body>
</html>