[113950] trunk/dports/science/gqrx

[michaelld at macports.org]

Revision: 113950
          https://trac.macports.org/changeset/113950
Author:   michaelld at macports.org
Date:     2013-11-26 07:35:57 -0800 (Tue, 26 Nov 2013)
Log Message:
-----------
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++.

Modified Paths:
--------------
    trunk/dports/science/gqrx/Portfile

Added Paths:
-----------
    trunk/dports/science/gqrx/files/patch-fix-real-imag.diff

Modified: trunk/dports/science/gqrx/Portfile
===================================================================
--- 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)
@@ -18,8 +18,16 @@
 
 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.}
 
-configure.post_args gqrx.pro
+# patch to fix usage of real and imag to be compatible with
+# both libstdc++ and libc++ runtimes
 
+# 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
+
 post-patch {
 
     # set install location
@@ -36,6 +44,8 @@
 
 }
 
+configure.post_args gqrx.pro
+
 post-destroot {
 
     # link the executable back to $qt_bins_dir
@@ -52,12 +62,12 @@
 
     github.setup        csete gqrx 2.2.0 v
 
-    checksums           rmd160  f8fc0f253734ad5dbe15155fe4e3de8b0c9bac72 \
-                        sha256  6f3114a7476cd1deaaaa37d08669ae44bdc387ce49f24a1db6ca2cf054467c45
+    checksums           rmd160 f8fc0f253734ad5dbe15155fe4e3de8b0c9bac72 \
+                        sha256 6f3114a7476cd1deaaaa37d08669ae44bdc387ce49f24a1db6ca2cf054467c45
 
     conflicts           gqrx-legacy gqrx-devel
 
-    patchfiles          patch-gqrx.pro.diff
+    patchfiles-append   patch-gqrx.pro.diff
 
 }
 
@@ -66,20 +76,20 @@
     long_description    ${description}  \
         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}
 
-    github.setup        csete gqrx 8c8351e2a2bcc2642b651b7eb1669e481d622773
+    github.setup        csete gqrx 6da5be1054fa181b8e35fcd15647ffe216f0cd76
 
     # fix port name set by github PortGroup
 
     name                gqrx-devel
 
-    version             2.2.1_20131121
+    version             2.2.1_20131125
 
-    checksums           rmd160  c1adb3df299261b05e2bfc1fec3aef5bd9d45957 \
-                        sha256  bbf6c00f8db089020f71a2eac1a8fe533bef3071ff33efc57a2724f01506b569
+    checksums           rmd160 a3ca748c92f5f270c1a00b7c2730581703a71ad9 \
+                        sha256 69c173be89117211df939d580416fc133f866652394366d3cab8d0e73a00b8b3
 
     conflicts           gqrx-legacy gqrx
 
-    patchfiles          patch-gqrx.pro-devel.diff
+    patchfiles-append   patch-gqrx.pro-devel.diff
 
 }
 
@@ -96,8 +106,8 @@
 
     version             2.0_20130703
 
-    checksums           rmd160  eba005dfad221997a7d80a8d8cd132cfea209667 \
-                        sha256  83403f9d2c05d10a8d8df76a4282c41b9d3547ceccaebecc92c1d3f0835a6f59
+    checksums           rmd160 eba005dfad221997a7d80a8d8cd132cfea209667 \
+                        sha256 83403f9d2c05d10a8d8df76a4282c41b9d3547ceccaebecc92c1d3f0835a6f59
 
     conflicts           gqrx gqrx-devel
 
@@ -106,7 +116,7 @@
     depends_lib-append  port:gnuradio-legacy \
                         port:gr-osmosdr-legacy
 
-    patchfiles          patch-gqrx.pro-legacy.diff
+    patchfiles-append   patch-gqrx.pro-legacy.diff
 
     # no version checking for now
 

Added: trunk/dports/science/gqrx/files/patch-fix-real-imag.diff
===================================================================
--- 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)
@@ -0,0 +1,33 @@
+--- 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)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20131126/223e261d/attachment.html>