<!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>[113950] 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/113950">113950</a></dd>
<dt>Author</dt> <dd>michaelld@macports.org</dd>
<dt>Date</dt> <dd>2013-11-26 07:35:57 -0800 (Tue, 26 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>gqrx:
+ whitespace;
+ update devel to 6da5be10 (20131125);
+ add global (for now) patch to fix usage of real/imag in std::complex, which differs between libstdc++ and libc++.</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="#trunkdportssciencegqrxfilespatchfixrealimagdiff">trunk/dports/science/gqrx/files/patch-fix-real-imag.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 (113949 => 113950)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/gqrx/Portfile 2013-11-26 14:41:58 UTC (rev 113949)
+++ trunk/dports/science/gqrx/Portfile 2013-11-26 15:35:57 UTC (rev 113950)
</span><span class="lines">@@ -18,8 +18,16 @@
</span><span class="cx">
</span><span class="cx"> set description_common {Gqrx is a software defined radio receiver for Funcube Dongle (FCD), RTL2832U-based DVB-T devices (RTL-SDR), Universal Software Radio Peripherals (USRP) and Osmo SDR devices. Gqrx is powered by GNU Radio and the Qt GUI toolkit. Gqrx is free and open source software and anyone is invited to hack the source code to suit their needs.}
</span><span class="cx">
</span><del>-configure.post_args gqrx.pro
</del><ins>+# patch to fix usage of real and imag to be compatible with
+# both libstdc++ and libc++ runtimes
</ins><span class="cx">
</span><ins>+# configure.cxx_stdlib works with MacPorts SVN trunk, not release;
+# do something else until both work.
+
+# if {[info exists configure.cxx_stdlib] && [string match libc++ ${configure.cxx_stdlib}]}
+
+patchfiles-append patch-fix-real-imag.diff
+
</ins><span class="cx"> post-patch {
</span><span class="cx">
</span><span class="cx"> # set install location
</span><span class="lines">@@ -36,6 +44,8 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+configure.post_args gqrx.pro
+
</ins><span class="cx"> post-destroot {
</span><span class="cx">
</span><span class="cx"> # link the executable back to $qt_bins_dir
</span><span class="lines">@@ -52,12 +62,12 @@
</span><span class="cx">
</span><span class="cx"> github.setup csete gqrx 2.2.0 v
</span><span class="cx">
</span><del>- checksums rmd160 f8fc0f253734ad5dbe15155fe4e3de8b0c9bac72 \
- sha256 6f3114a7476cd1deaaaa37d08669ae44bdc387ce49f24a1db6ca2cf054467c45
</del><ins>+ checksums rmd160 f8fc0f253734ad5dbe15155fe4e3de8b0c9bac72 \
+ sha256 6f3114a7476cd1deaaaa37d08669ae44bdc387ce49f24a1db6ca2cf054467c45
</ins><span class="cx">
</span><span class="cx"> conflicts gqrx-legacy gqrx-devel
</span><span class="cx">
</span><del>- patchfiles patch-gqrx.pro.diff
</del><ins>+ patchfiles-append patch-gqrx.pro.diff
</ins><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -66,20 +76,20 @@
</span><span class="cx"> long_description ${description} \
</span><span class="cx"> This port is kept up with the Gqrx GIT 'master' branch, is typically updated weekly to monthly, and provides compatibility with the GNU Radio release 3.7 API: the gnuradio and gnuradio-devel ports. ${description_common}
</span><span class="cx">
</span><del>- github.setup csete gqrx 8c8351e2a2bcc2642b651b7eb1669e481d622773
</del><ins>+ github.setup csete gqrx 6da5be1054fa181b8e35fcd15647ffe216f0cd76
</ins><span class="cx">
</span><span class="cx"> # fix port name set by github PortGroup
</span><span class="cx">
</span><span class="cx"> name gqrx-devel
</span><span class="cx">
</span><del>- version 2.2.1_20131121
</del><ins>+ version 2.2.1_20131125
</ins><span class="cx">
</span><del>- checksums rmd160 c1adb3df299261b05e2bfc1fec3aef5bd9d45957 \
- sha256 bbf6c00f8db089020f71a2eac1a8fe533bef3071ff33efc57a2724f01506b569
</del><ins>+ checksums rmd160 a3ca748c92f5f270c1a00b7c2730581703a71ad9 \
+ sha256 69c173be89117211df939d580416fc133f866652394366d3cab8d0e73a00b8b3
</ins><span class="cx">
</span><span class="cx"> conflicts gqrx-legacy gqrx
</span><span class="cx">
</span><del>- patchfiles patch-gqrx.pro-devel.diff
</del><ins>+ patchfiles-append patch-gqrx.pro-devel.diff
</ins><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -96,8 +106,8 @@
</span><span class="cx">
</span><span class="cx"> version 2.0_20130703
</span><span class="cx">
</span><del>- checksums rmd160 eba005dfad221997a7d80a8d8cd132cfea209667 \
- sha256 83403f9d2c05d10a8d8df76a4282c41b9d3547ceccaebecc92c1d3f0835a6f59
</del><ins>+ checksums rmd160 eba005dfad221997a7d80a8d8cd132cfea209667 \
+ sha256 83403f9d2c05d10a8d8df76a4282c41b9d3547ceccaebecc92c1d3f0835a6f59
</ins><span class="cx">
</span><span class="cx"> conflicts gqrx gqrx-devel
</span><span class="cx">
</span><span class="lines">@@ -106,7 +116,7 @@
</span><span class="cx"> depends_lib-append port:gnuradio-legacy \
</span><span class="cx"> port:gr-osmosdr-legacy
</span><span class="cx">
</span><del>- patchfiles patch-gqrx.pro-legacy.diff
</del><ins>+ patchfiles-append patch-gqrx.pro-legacy.diff
</ins><span class="cx">
</span><span class="cx"> # no version checking for now
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportssciencegqrxfilespatchfixrealimagdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/science/gqrx/files/patch-fix-real-imag.diff (0 => 113950)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/gqrx/files/patch-fix-real-imag.diff (rev 0)
+++ trunk/dports/science/gqrx/files/patch-fix-real-imag.diff 2013-11-26 15:35:57 UTC (rev 113950)
</span><span class="lines">@@ -0,0 +1,33 @@
</span><ins>+--- dsp/rx_agc_xx.cpp.orig 2013-11-25 21:47:44.000000000 -0500
++++ dsp/rx_agc_xx.cpp 2013-11-26 09:38:29.000000000 -0500
+@@ -79,6 +79,7 @@
+ boost::mutex::scoped_lock lock(d_mutex);
+
+ for (i = 0; i < noutput_items; i++) {
++ // implicit conversion from float to double
+ ib[i].im = in[i].imag();
+ ib[i].re = in[i].real();
+ }
+@@ -86,8 +87,8 @@
+ d_agc->ProcessData(noutput_items, &ib[0], &ob[0]);
+
+ for (i = 0; i < noutput_items; i++) {
+- out[i].real() = ob[i].re;
+- out[i].imag() = ob[i].im;
++ // implicit conversion from double to float
++ out[i] = gr_complex(ob[i].re, ob[i].im);
+ }
+
+ return noutput_items;
+--- dsp/rx_noise_blanker_cc.cpp.orig 2013-11-25 21:47:51.000000000 -0500
++++ dsp/rx_noise_blanker_cc.cpp 2013-11-25 21:48:01.000000000 -0500
+@@ -77,8 +77,7 @@
+ // copy data into output buffer then perform the processing on that buffer
+ for (i = 0; i < noutput_items; i++)
+ {
+- out[i].imag() = in[i].imag();
+- out[i].real() = in[i].real();
++ out[i] = in[i];
+ }
+
+ if (d_nb1_on)
</ins></span></pre>
</div>
</div>
</body>
</html>