<!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>[135830] trunk/dports/science/gqrx</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/135830">135830</a></dd>
<dt>Author</dt> <dd>michaelld@macports.org</dd>
<dt>Date</dt> <dd>2015-05-04 12:19:26 -0700 (Mon, 04 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>gqrx: add patch to fix building using clang / libc++, while keeping the code working with gcc / libstdc++.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportssciencegqrxPortfile">trunk/dports/science/gqrx/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportssciencegqrxfilespatchfixagc_impl_complexdiff">trunk/dports/science/gqrx/files/patch-fix-agc_impl_complex.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportssciencegqrxPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/gqrx/Portfile (135829 => 135830)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/gqrx/Portfile 2015-05-04 18:56:41 UTC (rev 135829)
+++ trunk/dports/science/gqrx/Portfile 2015-05-04 19:19:26 UTC (rev 135830)
</span><span class="lines">@@ -30,6 +30,10 @@
</span><span class="cx">
</span><span class="cx"> patchfiles-append patch-gqrx.pro.diff
</span><span class="cx">
</span><ins>+ # fix AGC complex
+
+ patchfiles-append patch-fix-agc_impl_complex.diff
+
</ins><span class="cx"> # allow gqrx to work with both gnuradio and gnuradio-devel ...
</span><span class="cx">
</span><span class="cx"> depends_lib-append port:gr-osmosdr \
</span></span></pre></div>
<a id="trunkdportssciencegqrxfilespatchfixagc_impl_complexdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/science/gqrx/files/patch-fix-agc_impl_complex.diff (0 => 135830)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/gqrx/files/patch-fix-agc_impl_complex.diff (rev 0)
+++ trunk/dports/science/gqrx/files/patch-fix-agc_impl_complex.diff 2015-05-04 19:19:26 UTC (rev 135830)
</span><span class="lines">@@ -0,0 +1,64 @@
</span><ins>+--- dsp/agc_impl.cpp.orig
++++ dsp/agc_impl.cpp
+@@ -88,6 +88,7 @@ CAgc::CAgc()
+ m_SlopeFactor = 0;
+ m_Decay = 0;
+ m_SampleRate = 100.0;
++ m_SigDelayBuf_r = (float*)(&m_SigDelayBuf);
+ }
+
+ CAgc::~CAgc()
+@@ -126,8 +127,7 @@ void CAgc::SetParameters(bool AgcOn, bool UseHang, int Threshold, int ManualGai
+ m_SampleRate = SampleRate;
+ for (int i = 0; i < MAX_DELAY_BUF; i++)
+ {
+- m_SigDelayBuf[i].real() = 0.0;
+- m_SigDelayBuf[i].imag() = 0.0;
++ m_SigDelayBuf[i] = 0.0;
+ m_MagBuf[i] = -16.0;
+ }
+ m_SigDelayPtr = 0;
+@@ -292,8 +292,7 @@ void CAgc::ProcessData(int Length, const TYPECPX * pInData, TYPECPX * pOutData)
+ // use variable gain if above knee
+ gain = AGC_OUTSCALE * powf(10.0, mag * (m_GainSlope - 1.0));
+
+- pOutData[i].real() = delayedin.real() * gain;
+- pOutData[i].imag() = delayedin.imag() * gain;
++ pOutData[i] = delayedin * gain;
+ }
+ }
+ else
+@@ -301,8 +300,7 @@ void CAgc::ProcessData(int Length, const TYPECPX * pInData, TYPECPX * pOutData)
+ // manual gain just multiply by m_ManualGain
+ for (int i = 0; i < Length; i++)
+ {
+- pOutData[i].real() = m_ManualAgcGain * pInData[i].real();
+- pOutData[i].imag() = m_ManualAgcGain * pInData[i].imag();
++ pOutData[i] = m_ManualAgcGain * pInData[i];
+ }
+ }
+ }
+@@ -324,10 +322,10 @@ void CAgc::ProcessData(int Length, const float *pInData, float * pOutData)
+ float in = pInData[i];
+
+ // Get delayed sample of input signal
+- delayedin = m_SigDelayBuf[m_SigDelayPtr].real();
++ delayedin = m_SigDelayBuf_r[m_SigDelayPtr];
+
+ // put new input sample into signal delay buffer
+- m_SigDelayBuf[m_SigDelayPtr++].real() = in;
++ m_SigDelayBuf_r[m_SigDelayPtr++] = in;
+ if (m_SigDelayPtr >= m_DelaySamples) //deal with delay buffer wrap around
+ m_SigDelayPtr = 0;
+
+--- dsp/agc_impl.h.orig
++++ dsp/agc_impl.h
+@@ -72,6 +72,8 @@ private:
+ int m_HangTimer;
+
+ TYPECPX m_SigDelayBuf[MAX_DELAY_BUF];
++ float* m_SigDelayBuf_r;
++
+ float m_MagBuf[MAX_DELAY_BUF];
+ };
+
</ins></span></pre>
</div>
</div>
</body>
</html>