[136501] trunk/dports/science/gqrx

[michaelld at macports.org]

Revision: 136501
          https://trac.macports.org/changeset/136501
Author:   michaelld at macports.org
Date:     2015-05-19 09:35:28 -0700 (Tue, 19 May 2015)
Log Message:
-----------
gqrx: update to 8ffff0ca (20150518), removing integrated patch.

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

Removed Paths:
-------------
    trunk/dports/science/gqrx/files/patch-fix-agc_impl_complex.diff

Modified: trunk/dports/science/gqrx/Portfile
===================================================================
--- trunk/dports/science/gqrx/Portfile	2015-05-19 16:34:38 UTC (rev 136500)
+++ trunk/dports/science/gqrx/Portfile	2015-05-19 16:35:28 UTC (rev 136501)
@@ -20,20 +20,16 @@
     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 e511a93693346c8bb1d1e1682a5d131f718cf336
-    version             20150503
+    github.setup        csete gqrx 8ffff0cabaead5960cb558da596d6c060f0de711
+    version             20150518
 
-    checksums           rmd160 2e1a644835051b490a715a6511bb79a12580f76a \
-                        sha256 12c0a7ac027ecef4df158f08e941d652794ae1b414ca1af356af2266333ebbb4
+    checksums           rmd160 96b00bff91607cc321dc03cc0d7e00cb5c8e1e91 \
+                        sha256 bd416c5591aa6061de5a280c2dbbc638e150a20a50ec24024a250317554812b2
 
     conflicts           gqrx-legacy
 
     patchfiles-append   patch-gqrx.pro.diff
 
-    # fix AGC complex
-
-    patchfiles-append   patch-fix-agc_impl_complex.diff
-
     # allow gqrx to work with both gnuradio and gnuradio-devel ...
 
     depends_lib-append  port:gr-osmosdr \

Deleted: trunk/dports/science/gqrx/files/patch-fix-agc_impl_complex.diff
===================================================================
--- trunk/dports/science/gqrx/files/patch-fix-agc_impl_complex.diff	2015-05-19 16:34:38 UTC (rev 136500)
+++ trunk/dports/science/gqrx/files/patch-fix-agc_impl_complex.diff	2015-05-19 16:35:28 UTC (rev 136501)
@@ -1,64 +0,0 @@
---- 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];
- };
- 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150519/445ddb3a/attachment.html>