[142795] trunk/dports/science/gqrx
michaelld at macports.org
michaelld at macports.org
Sat Dec 12 07:16:05 PST 2015
Revision: 142795
https://trac.macports.org/changeset/142795
Author: michaelld at macports.org
Date: 2015-11-23 08:40:13 -0800 (Mon, 23 Nov 2015)
Log Message:
-----------
gqrx:
+ update to 75888562 (20151122), removing integrated patch;
+ remove devel version.
Modified Paths:
--------------
trunk/dports/science/gqrx/Portfile
Removed Paths:
-------------
trunk/dports/science/gqrx/files/patch-fix_std_complex.diff
Modified: trunk/dports/science/gqrx/Portfile
===================================================================
--- trunk/dports/science/gqrx/Portfile 2015-11-23 16:28:50 UTC (rev 142794)
+++ trunk/dports/science/gqrx/Portfile 2015-11-23 16:40:13 UTC (rev 142795)
@@ -20,19 +20,15 @@
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 2f42e982ba4a0f0ef55df3a5136aac16aa9618f4
- version 20151119
- checksums rmd160 a33271192e26a7f6a72276067a42487e0b51a424 \
- sha256 43b3a56b057128257c7fd95f61c8fc861dfe519d44c1bd8401744099b011e76e
+ github.setup csete gqrx 75888562d59b1ebb2b11fbd7f09887d59db6bab8
+ version 20151122
+ checksums rmd160 c3a2fcf90d9325da81c75188ca688f63ecf2f69b \
+ sha256 8956a04972450a1e147be5852245178cc037ba3db2c3935b3d0fd30ceaafdb09
conflicts gqrx-legacy
patchfiles-append patch-gqrx.pro.diff
- # fix use of std::complex to be compatible back to g++ 4.2
-
- patchfiles-append patch-fix_std_complex.diff
-
# allow gqrx to work with both gnuradio and gnuradio-devel ...
depends_lib-append port:gr-osmosdr \
@@ -57,28 +53,6 @@
variant portaudio description "Legacy variant" {}
}
-subport gqrx-devel {
-
- # This port can be removed on December 4, 2015.
-
- replaced_by gqrx
- PortGroup obsolete 1.0
-
- name gqrx-devel
-
- github.setup csete gqrx 9648a148e04d0e5fc15b26151f44f8b10e8180e9
- version 20141127
-
- depends_lib
- depends_build
- depends_run
-
- patchfiles
-
- conflicts gqrx-legacy
-
-}
-
subport gqrx-legacy {
long_description ${description} \
@@ -96,7 +70,7 @@
checksums rmd160 eba005dfad221997a7d80a8d8cd132cfea209667 \
sha256 83403f9d2c05d10a8d8df76a4282c41b9d3547ceccaebecc92c1d3f0835a6f59
- conflicts gqrx gqrx-devel
+ conflicts gqrx
# gqrx-legacy works with *-legacy only
@@ -106,8 +80,7 @@
patchfiles-append patch-gqrx.pro-legacy.diff
# patch to fix usage of real and imag to be compatible with both
- # libstdc++ and libc++ runtimes; this patch is included with the
- # release and devel from upstream.
+ # libstdc++ and libc++ runtimes; this patch is included upstream.
patchfiles-append patch-fix-real-imag.diff
@@ -121,86 +94,84 @@
homepage http://gqrx.dk/
-if {${subport} ne "gqrx-devel"} {
- if {${subport} eq "gqrx"} {
+if {${subport} eq "gqrx"} {
- variant qt4 conflicts qt5 description {Build ${subport} using Qt4} {
- PortGroup qmake 1.0
- }
+ variant qt4 conflicts qt5 description {Build ${subport} using Qt4} {
+ PortGroup qmake 1.0
+ }
- variant qt5 conflicts qt4 description {Build ${subport} using Qt5} {
+ variant qt5 conflicts qt4 description {Build ${subport} using Qt5} {
- PortGroup qmake5 1.0
- PortGroup active_variants 1.1
+ PortGroup qmake5 1.0
+ PortGroup active_variants 1.1
- # make sure gnuradio* is installed with -qtgui, because we
- # can't have Qt4 and Qt5 installed at the same time (yet),
- # and gnuradio* does not (yet) support Qt5.
+ # make sure gnuradio* is installed with -qtgui, because we
+ # can't have Qt4 and Qt5 installed at the same time (yet),
+ # and gnuradio* does not (yet) support Qt5.
- require_active_variants path:lib/libgnuradio-audio.dylib:gnuradio "" qtgui
+ require_active_variants path:lib/libgnuradio-audio.dylib:gnuradio "" qtgui
- }
+ }
- # default to +qt4
+ # default to +qt4
- if {![variant_isset qt4] && ![variant_isset qt5]} {
- default_variants +qt4
- }
+ if {![variant_isset qt4] && ![variant_isset qt5]} {
+ default_variants +qt4
+ }
- # make sure -qt4 is not used alone
+ # make sure -qt4 is not used alone
- if {![variant_isset qt4] && ![variant_isset qt5]} {
+ if {![variant_isset qt4] && ![variant_isset qt5]} {
- ui_error "\n\nYou must select either the +qt4 or +qt5 variant.\n"
- return -code error "Invalid variant selection"
+ ui_error "\n\nYou must select either the +qt4 or +qt5 variant.\n"
+ return -code error "Invalid variant selection"
- }
- } else {
+ }
+} else {
- # gqrx-legacy uses Qt4 only
- PortGroup qmake 1.0
+ # gqrx-legacy uses Qt4 only
+ PortGroup qmake 1.0
- }
+}
- post-patch {
+post-patch {
- # set install location
+ # set install location
- reinplace "s|@APPSDIR@|${qt_apps_dir}|g" ${worksrcpath}/gqrx.pro
+ reinplace "s|@APPSDIR@|${qt_apps_dir}|g" ${worksrcpath}/gqrx.pro
- # set version
+ # set version
- reinplace "s|@VERSION@|${version}|g" ${worksrcpath}/gqrx.pro
+ reinplace "s|@VERSION@|${version}|g" ${worksrcpath}/gqrx.pro
- # set arch type(s)
+ # set arch type(s)
- reinplace "s|@ARCHES@|${qt_arch_types}|g" ${worksrcpath}/gqrx.pro
+ reinplace "s|@ARCHES@|${qt_arch_types}|g" ${worksrcpath}/gqrx.pro
- }
+}
- configure.post_args gqrx.pro
+configure.post_args gqrx.pro
- post-configure {
+post-configure {
- # remove indirect dependency on Volk added by pkgconfig
+ # remove indirect dependency on Volk added by pkgconfig
- reinplace "s|-lvolk ||g" ${worksrcpath}/Makefile
+ reinplace "s|-lvolk ||g" ${worksrcpath}/Makefile
- }
+}
- post-destroot {
+post-destroot {
- # link the executable back to $qt_bins_dir, and, if $qt_dir is
- # not $prefix, back to $prefix/bin too.
+ # link the executable back to $qt_bins_dir, and, if $qt_dir is
+ # not $prefix, back to $prefix/bin too.
- xinstall -m 755 -d ${destroot}${qt_bins_dir}
- ln -s ${qt_apps_dir}/Gqrx.app/Contents/MacOS/Gqrx \
- ${destroot}${qt_bins_dir}
+ xinstall -m 755 -d ${destroot}${qt_bins_dir}
+ ln -s ${qt_apps_dir}/Gqrx.app/Contents/MacOS/Gqrx \
+ ${destroot}${qt_bins_dir}
- if {${qt_dir} ne ${prefix}} {
- xinstall -m 755 -d ${destroot}${prefix}/bin
- ln -s ${qt_apps_dir}/Gqrx.app/Contents/MacOS/Gqrx \
- ${destroot}${prefix}/bin
- }
+ if {${qt_dir} ne ${prefix}} {
+ xinstall -m 755 -d ${destroot}${prefix}/bin
+ ln -s ${qt_apps_dir}/Gqrx.app/Contents/MacOS/Gqrx \
+ ${destroot}${prefix}/bin
}
}
Deleted: trunk/dports/science/gqrx/files/patch-fix_std_complex.diff
===================================================================
--- trunk/dports/science/gqrx/files/patch-fix_std_complex.diff 2015-11-23 16:28:50 UTC (rev 142794)
+++ trunk/dports/science/gqrx/files/patch-fix_std_complex.diff 2015-11-23 16:40:13 UTC (rev 142795)
@@ -1,94 +0,0 @@
---- src/dsp/rx_meter.cpp.orig
-+++ src/dsp/rx_meter.cpp
-@@ -65,7 +65,7 @@
- if (d_num == 0)
- {
- // first sample after a reset
-- d_level = in[0].real()*in[0].real() + in[0].imag()*in[0].imag();
-+ d_level = std::norm(in[0]);
- d_sum = d_level;
- d_sumsq = d_level*d_level;
- i = 1;
-@@ -78,14 +78,14 @@
- {
- case DETECTOR_TYPE_SAMPLE:
- // just take the first sample
-- d_level = in[0].real()*in[0].real() + in[0].imag()*in[0].imag();
-+ d_level = std::norm(in[0]);
- break;
-
- case DETECTOR_TYPE_MIN:
- // minimum peak
- while (i < noutput_items)
- {
-- pwr = in[i].real()*in[i].real() + in[i].imag()*in[i].imag();
-+ pwr = std::norm(in[i]);
- if (pwr < d_level)
- d_level = pwr;
- i++;
-@@ -96,7 +96,7 @@
- // maximum peak
- while (i < noutput_items)
- {
-- pwr = in[i].real()*in[i].real() + in[i].imag()*in[i].imag();
-+ pwr = std::norm(in[i]);
- if (pwr > d_level)
- d_level = pwr;
- i++;
-@@ -107,7 +107,7 @@
- // mean value
- while (i < noutput_items)
- {
-- pwr = in[i].real()*in[i].real() + in[i].imag()*in[i].imag();
-+ pwr = std::norm(in[i]);
- d_sum += pwr;
- i++;
- }
-@@ -118,7 +118,7 @@
- // root mean square
- while (i < noutput_items)
- {
-- pwr = in[i].real()*in[i].real() + in[i].imag()*in[i].imag();
-+ pwr = std::norm(in[i]);
- d_sumsq += pwr*pwr;
- i++;
- }
---- src/applications/gqrx/mainwindow.cpp.orig
-+++ src/applications/gqrx/mainwindow.cpp
-@@ -1305,7 +1305,7 @@
- }
-
- /* calculate power in dBFS */
-- pwr = pwr_scale * (pt.imag() * pt.imag() + pt.real() * pt.real());
-+ pwr = pwr_scale * std::norm(pt);
- d_realFftData[i] = 10.0 * log10f(pwr + 1.0e-20);
-
- /* FFT averaging */
-@@ -1353,7 +1353,7 @@
- }
-
- /* calculate power in dBFS */
-- pwr = pwr_scale * (pt.imag() * pt.imag() + pt.real() * pt.real());
-+ pwr = pwr_scale * std::norm(pt);
- d_realFftData[i] = 10.0 * log10f(pwr + 1.0e-20);
- }
-
---- src/dsp/filter/decimator.cpp.orig
-+++ src/dsp/filter/decimator.cpp
-@@ -307,13 +307,9 @@
-
- for(i = 0; i < (InLength - 11 - 6) / 2; i++)
- {
-- (*pOut).real( H0 * pIn[0].real() + H2 * pIn[2].real()
-- + H4 * pIn[4].real() + H5 * pIn[5].real() + H6 * pIn[6].real()
-- + H8 * pIn[8].real() + H10 * pIn[10].real());
-- (*pOut++).imag( H0 * pIn[0].imag() + H2 * pIn[2].imag()
-- + H4 * pIn[4].imag() + H5 * pIn[5].imag() + H6 * pIn[6].imag()
-- + H8 * pIn[8].imag() + H10 * pIn[10].imag());
-- pIn += 2;
-+ *pOut++ = (H0 * pIn[0]) + (H2 * pIn[2]) + (H4 * pIn[4]) +
-+ (H5 * pIn[5]) + (H6 * pIn[6]) + (H8 * pIn[8]) + (H10 * pIn[10]);
-+ pIn += 2;
- }
-
- // copy first outputs back into output array so outbuf can be same as inbuf
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151212/9725337a/attachment.html>
More information about the macports-changes
mailing list