<!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>[134400] 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/134400">134400</a></dd>
<dt>Author</dt> <dd>michaelld@macports.org</dd>
<dt>Date</dt> <dd>2015-03-24 09:34:55 -0700 (Tue, 24 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>gnuradio:
+ add temporary patch to fix use of std::complex in dvbt2_paprtr_cc_impl.cc;
+ update devel to 90246821 and next to 65df3e31, both 2015-03-22.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportssciencegnuradioPortfile">trunk/dports/science/gnuradio/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportssciencegnuradiofilespatchdvbt2_paprtr_cc_implccdiff">trunk/dports/science/gnuradio/files/patch-dvbt2_paprtr_cc_impl.cc.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 (134399 => 134400)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/gnuradio/Portfile 2015-03-24 16:08:27 UTC (rev 134399)
+++ trunk/dports/science/gnuradio/Portfile 2015-03-24 16:34:55 UTC (rev 134400)
</span><span class="lines">@@ -90,14 +90,14 @@
</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><span class="cx"> name gnuradio-devel
</span><del>- github.setup gnuradio gnuradio 8a3ad1a5a41f95c3b624a2a87e3285c44452c9a7
- version 20150319
</del><ins>+ github.setup gnuradio gnuradio 9024682186cf176749df4de948d034661b19638f
+ version 20150322
</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 58bd32d5b43745c7da66d4153610883095779d6b \
- sha256 4358d346b15bcdbe54db3bcf12602a96eec1fc962dbb7553475642c320b1a4ce
</del><ins>+ rmd160 eeabe4d743c9a5c535d6a5f30bc5a08b3c975df2 \
+ sha256 0d81bd7d9b440716119fcb0824e28f59f86fd1810b9738a975b724c07e42f7b2
</ins><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -107,14 +107,14 @@
</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><span class="cx"> name gnuradio-next
</span><del>- github.setup gnuradio gnuradio e845d8bc2973649bf88aec79fad48198bd06a052
- version 20150319
</del><ins>+ github.setup gnuradio gnuradio 65df3e31166b8f517a3779cddcdb7db5e68cdc9c
+ version 20150322
</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 aa884e5fe0608c82cc17d2c9c61d6c51b46ea70e \
- sha256 43b9f3d2fffbe570c4f1470d7a40bf534348e75d678c9826f98b3fc521ed4161
</del><ins>+ rmd160 fbc5849e3f92c6f113d2360d86364c1b972cc953 \
+ sha256 a3bbe2ef48a44da51a6ccfa9cc64d6b99fc0cf26a48542a9e9122847cedcbfbe
</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">@@ -152,6 +152,11 @@
</span><span class="cx"> # temporary misc patches for warnings and some bug fixes
</span><span class="cx"> patchfiles-append \
</span><span class="cx"> patch-various.diff
</span><ins>+
+ # temporary patch to fix use of std::complex in dvbt2_paprtr_cc_impl.cc
+ patchfiles-append \
+ patch-dvbt2_paprtr_cc_impl.cc.diff
+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # 3.7 API variants
</span></span></pre></div>
<a id="trunkdportssciencegnuradiofilespatchdvbt2_paprtr_cc_implccdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/science/gnuradio/files/patch-dvbt2_paprtr_cc_impl.cc.diff (0 => 134400)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/gnuradio/files/patch-dvbt2_paprtr_cc_impl.cc.diff (rev 0)
+++ trunk/dports/science/gnuradio/files/patch-dvbt2_paprtr_cc_impl.cc.diff 2015-03-24 16:34:55 UTC (rev 134400)
</span><span class="lines">@@ -0,0 +1,50 @@
</span><ins>+--- gr-dtv/lib/dvbt2/dvbt2_paprtr_cc_impl.cc.orig
++++ gr-dtv/lib/dvbt2/dvbt2_paprtr_cc_impl.cc
+@@ -24,7 +24,6 @@
+
+ #include <gnuradio/io_signature.h>
+ #include "dvbt2_paprtr_cc_impl.h"
+-#include <complex.h>
+ #include <volk/volk.h>
+ #include <stdio.h>
+
+@@ -670,21 +669,16 @@ namespace gr {
+ {
+ const gr_complex *in = (const gr_complex *) input_items[0];
+ gr_complex *out = (gr_complex *) output_items[0];
+- gr_complex zero, one;
+- int index, valid;
+- int L_FC = 0;
+ gr_complex *dst;
++ int m = 0, L_FC = 0, index, valid;
+ float normalization = 1.0 / N_TR;
+- int m = 0;
+- float y, a, alpha, center = (C_PS - 1) / 2;
++ float y, a, alpha, center = (C_PS - 1) / 2.0;
+ float aMax = 5.0 * N_TR * sqrt(10.0 / (27.0 * C_PS));
++ const gr_complex zero (0.0, 0.0);
++ const gr_complex one (1.0, 0.0);
+ gr_complex u, result, temp;
+- double _Complex vtemp;
++ double vtemp;
+
+- one.real() = 1.0;
+- one.imag() = 0.0;
+- zero.real() = 0.0;
+- zero.imag() = 0.0;
+ if (N_FC != 0) {
+ L_FC = 1;
+ }
+@@ -767,10 +761,8 @@ namespace gr {
+ u.imag() = (in[m].imag() + c[m].imag()) / y;
+ alpha = y - v_clip;
+ for (int n = 0; n < N_TR; n++) {
+- vtemp = 0.0 + ((2 * M_PI * m * ((papr_map[n] + shift) - center)) / papr_fft_size * _Complex_I);
+- vtemp = cexp(vtemp);
+- ctemp[n].real() = creal(vtemp);
+- ctemp[n].imag() = -cimag(vtemp);
++ vtemp = (-2.0 * M_PI * m * ((papr_map[n] + shift) - center)) / papr_fft_size;
++ ctemp[n] = std::exp (gr_complexd (0.0, vtemp));
+ }
+ volk_32fc_s32fc_multiply_32fc(v, ctemp, u, N_TR);
+ temp.real() = alpha;
</ins></span></pre>
</div>
</div>
</body>
</html>