<!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>[149067] trunk/dports/science/gnss-sdr</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/149067">149067</a></dd>
<dt>Author</dt> <dd>michaelld@macports.org</dd>
<dt>Date</dt> <dd>2016-05-27 20:05:38 -0700 (Fri, 27 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>gnss-sdr-devel & next: add temporary patch to fix build.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportssciencegnsssdrPortfile">trunk/dports/science/gnss-sdr/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/dports/science/gnss-sdr/files/</li>
<li><a href="#trunkdportssciencegnsssdrfilespatchvolk_max_uint16_tdiff">trunk/dports/science/gnss-sdr/files/patch-volk_max_uint16_t.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportssciencegnsssdrPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/gnss-sdr/Portfile (149066 => 149067)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/gnss-sdr/Portfile 2016-05-28 01:17:47 UTC (rev 149066)
+++ trunk/dports/science/gnss-sdr/Portfile 2016-05-28 03:05:38 UTC (rev 149067)
</span><span class="lines">@@ -53,6 +53,10 @@
</span><span class="cx">
</span><span class="cx"> require_active_variants port:gnuradio-devel uhd
</span><span class="cx">
</span><ins>+ # temporary patch to fix API usage of volk max to be uint16_t
+
+ patchfiles-append patch-volk_max_uint16_t.diff
+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> subport gnss-sdr-next {
</span><span class="lines">@@ -72,6 +76,10 @@
</span><span class="cx">
</span><span class="cx"> require_active_variants port:gnuradio-next uhd
</span><span class="cx">
</span><ins>+ # temporary patch to fix API usage of volk max to be uint16_t
+
+ patchfiles-append patch-volk_max_uint16_t.diff
+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # override github PortGroup homepage setting
</span></span></pre></div>
<a id="trunkdportssciencegnsssdrfilespatchvolk_max_uint16_tdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/science/gnss-sdr/files/patch-volk_max_uint16_t.diff (0 => 149067)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/gnss-sdr/files/patch-volk_max_uint16_t.diff (rev 0)
+++ trunk/dports/science/gnss-sdr/files/patch-volk_max_uint16_t.diff 2016-05-28 03:05:38 UTC (rev 149067)
</span><span class="lines">@@ -0,0 +1,159 @@
</span><ins>+--- src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.cc.orig
++++ src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.cc
+@@ -424,11 +424,11 @@ int galileo_e5a_noncoherentIQ_acquisition_caf_cc::general_work(int noutput_items
+
+ // initialize acquisition algorithm
+ int doppler;
+- unsigned int indext = 0;
+- unsigned int indext_IA = 0;
+- unsigned int indext_IB = 0;
+- unsigned int indext_QA = 0;
+- unsigned int indext_QB = 0;
++ uint16_t indext = 0;
++ uint16_t indext_IA = 0;
++ uint16_t indext_IB = 0;
++ uint16_t indext_QA = 0;
++ uint16_t indext_QB = 0;
+ float magt = 0.0;
+ float magt_IA = 0.0;
+ float magt_IB = 0.0;
+--- src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc.orig
++++ src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc
+@@ -242,9 +242,9 @@ int galileo_pcps_8ms_acquisition_cc::general_work(int noutput_items,
+ {
+ // initialize acquisition algorithm
+ int doppler;
+- unsigned int indext = 0;
+- unsigned int indext_A = 0;
+- unsigned int indext_B = 0;
++ uint16_t indext = 0;
++ uint16_t indext_A = 0;
++ uint16_t indext_B = 0;
+ float magt = 0.0;
+ float magt_A = 0.0;
+ float magt_B = 0.0;
+--- src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_cc.cc.orig
++++ src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_cc.cc
+@@ -284,7 +284,7 @@ int pcps_acquisition_cc::general_work(int noutput_items,
+ {
+ // initialize acquisition algorithm
+ int doppler;
+- unsigned int indext = 0;
++ uint16_t indext = 0;
+ float magt = 0.0;
+ const gr_complex *in = (const gr_complex *)input_items[0]; //Get the input samples pointer
+
+--- src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.cc.orig
++++ src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.cc
+@@ -222,8 +222,8 @@ double pcps_acquisition_fine_doppler_cc::search_maximum()
+ float magt = 0.0;
+ float fft_normalization_factor;
+ int index_doppler = 0;
+- unsigned int tmp_intex_t;
+- unsigned int index_time = 0;
++ uint16_t tmp_intex_t;
++ uint16_t index_time = 0;
+
+ for (int i=0;i<d_num_doppler_points;i++)
+ {
+@@ -359,7 +359,7 @@ int pcps_acquisition_fine_doppler_cc::estimate_Doppler(gr_vector_const_void_star
+
+ volk_32fc_magnitude_squared_32f(p_tmp_vector, fft_operator->get_outbuf(), fft_size_extended);
+
+- unsigned int tmp_index_freq = 0;
++ uint16_t tmp_index_freq = 0;
+ volk_32f_index_max_16u(&tmp_index_freq, p_tmp_vector, fft_size_extended);
+
+ //case even
+--- src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_sc.cc.orig
++++ src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_sc.cc
+@@ -281,7 +281,7 @@ int pcps_acquisition_sc::general_work(int noutput_items,
+ {
+ // initialize acquisition algorithm
+ int doppler;
+- unsigned int indext = 0;
++ uint16_t indext = 0;
+ float magt = 0.0;
+ const lv_16sc_t *in = (const lv_16sc_t *)input_items[0]; //Get the input samples pointer
+ int effective_fft_size = ( d_bit_transition_flag ? d_fft_size/2 : d_fft_size );
+--- src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.cc.orig
++++ src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.cc
+@@ -268,8 +268,8 @@ double pcps_assisted_acquisition_cc::search_maximum()
+ float magt = 0.0;
+ float fft_normalization_factor;
+ int index_doppler = 0;
+- unsigned int tmp_intex_t;
+- unsigned int index_time = 0;
++ uint16_t tmp_intex_t;
++ uint16_t index_time = 0;
+
+ for (int i=0;i<d_num_doppler_points;i++)
+ {
+--- src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc.orig
++++ src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc
+@@ -254,9 +254,9 @@ int pcps_cccwsr_acquisition_cc::general_work(int noutput_items,
+ {
+ // initialize acquisition algorithm
+ int doppler;
+- unsigned int indext = 0;
+- unsigned int indext_plus = 0;
+- unsigned int indext_minus = 0;
++ uint16_t indext = 0;
++ uint16_t indext_plus = 0;
++ uint16_t indext_minus = 0;
+ float magt = 0.0;
+ float magt_plus = 0.0;
+ float magt_minus = 0.0;
+--- src/algorithms/acquisition/gnuradio_blocks/pcps_multithread_acquisition_cc.cc.orig
++++ src/algorithms/acquisition/gnuradio_blocks/pcps_multithread_acquisition_cc.cc
+@@ -200,7 +200,7 @@ void pcps_multithread_acquisition_cc::acquisition_core()
+ {
+ // initialize acquisition algorithm
+ int doppler;
+- unsigned int indext = 0;
++ uint16_t indext = 0;
+ float magt = 0.0;
+ float fft_normalization_factor = (float)d_fft_size * (float)d_fft_size;
+ gr_complex* in = d_in_buffer[d_well_count];
+--- src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.cc.orig
++++ src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.cc
+@@ -386,7 +386,7 @@ void pcps_opencl_acquisition_cc::acquisition_core_volk()
+ {
+ // initialize acquisition algorithm
+ int doppler;
+- unsigned int indext = 0;
++ uint16_t indext = 0;
+ float magt = 0.0;
+ float fft_normalization_factor = static_cast<float>(d_fft_size) * static_cast<float>(d_fft_size);
+ gr_complex* in = d_in_buffer[d_well_count];
+@@ -508,7 +508,7 @@ void pcps_opencl_acquisition_cc::acquisition_core_opencl()
+ {
+ // initialize acquisition algorithm
+ int doppler;
+- unsigned int indext = 0;
++ uint16_t indext = 0;
+ float magt = 0.0;
+ float fft_normalization_factor = (static_cast<float>(d_fft_size_pow2) * static_cast<float>(d_fft_size)); //This works, but I am not sure why.
+ gr_complex* in = d_in_buffer[d_well_count];
+--- src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc.orig
++++ src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc
+@@ -301,7 +301,7 @@ int pcps_quicksync_acquisition_cc::general_work(int noutput_items,
+ /* initialize acquisition implementing the QuickSync algorithm*/
+ //DLOG(INFO) << "START CASE 1";
+ int doppler;
+- unsigned int indext = 0;
++ uint16_t indext = 0;
+ float magt = 0.0;
+ const gr_complex *in = (const gr_complex *)input_items[0]; //Get the input samples pointer
+
+--- src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.cc.orig
++++ src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.cc
+@@ -279,7 +279,7 @@ int pcps_tong_acquisition_cc::general_work(int noutput_items,
+ {
+ // initialize acquisition algorithm
+ int doppler;
+- unsigned int indext = 0;
++ uint16_t indext = 0;
+ float magt = 0.0;
+ const gr_complex *in = (const gr_complex *)input_items[0]; //Get the input samples pointer
+ float fft_normalization_factor = static_cast<float>(d_fft_size) * static_cast<float>(d_fft_size);
</ins></span></pre>
</div>
</div>
</body>
</html>