<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/ba76c90f123af8091c572af9e593e8e063985960">https://github.com/macports/macports-ports/commit/ba76c90f123af8091c572af9e593e8e063985960</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new ba76c90f123 gr37-ofdm: better patch to fix float -> Complex build error
</span>ba76c90f123 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit ba76c90f123af8091c572af9e593e8e063985960
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Thu Jul 16 21:08:11 2020 -0400
<span style='display:block; white-space:pre;color:#404040;'> gr37-ofdm: better patch to fix float -> Complex build error
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The use of "I" for complex(0,1) is C++14, but this port uses just C++11. So, use gr_complex to set the value instead. It might not be as fast, but it'll work.
</span>---
science/gr-ofdm/Portfile | 5 ++---
science/gr-ofdm/files/patch-build-clang_c++11.diff | 20 ++++++++++++++++++--
.../gr-ofdm/files/patch-complex_to_float_error.diff | 13 -------------
3 files changed, 20 insertions(+), 18 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gr-ofdm/Portfile b/science/gr-ofdm/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4bc4f5461ab..dd8143397b7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gr-ofdm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gr-ofdm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,7 +31,7 @@ subport gr37-ofdm {
</span>
github.setup rwth-ti gr-ofdm a40720c708b75ad4c12ff09e49931879e9f90e78
version 20180306
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span> checksums rmd160 ee1f3054e00e57986fa7536d9691018c69e9e68a \
sha256 b053745b3590f1842a35c9914b344db295c2a479ce65711cc3112dc848427e7b \
size 3257234
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,8 +50,7 @@ subport gr37-ofdm {
</span> # adds boost::thread and volk finding.
# fixes ITPP finding.
patchfiles-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-build-clang_c++11.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-complex_to_float_error.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-build-clang_c++11.diff
</span> patch.pre_args -p1
# specify ITPP to use
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gr-ofdm/files/patch-build-clang_c++11.diff b/science/gr-ofdm/files/patch-build-clang_c++11.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index bfa2de96bb6..8a21917ff28 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gr-ofdm/files/patch-build-clang_c++11.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gr-ofdm/files/patch-build-clang_c++11.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1501,10 +1501,10 @@ index 57e8db7..050dadc 100644
</span> std::vector<int> out_sig(3);
out_sig[0] = sizeof(int); // bitcount
diff --git a/lib/allocation_src_impl.cc b/lib/allocation_src_impl.cc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index ccd7917..e2426e8 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index ccd7917..bdf2da0 100644
</span> --- a/lib/allocation_src_impl.cc
+++ b/lib/allocation_src_impl.cc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -62,8 +62,8 @@ namespace gr {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -62,14 +62,14 @@ namespace gr {
</span> ,d_subcarriers(subcarriers)
,d_data_symbols(data_symbols)
,d_coding( coding )
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1515,6 +1515,13 @@ index ccd7917..e2426e8 100644
</span> ,d_modulbitcount_out(2000)
,d_allocation_scheme(CM)
,d_power_limit(subcarriers)
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ ,d_data_rate(subcarriers*3)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ,d_gap(6.6)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ,d_amplitude_out(1.0 + 1.0i)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ,d_amplitude_out(gr_complex(1.0,1.0))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ,d_amplitude_abs(1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span> @@ -436,7 +436,7 @@ namespace gr {
d_amplitude_abs += level - d_gap/d_resource_blocks.snr[i];
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1524,6 +1531,15 @@ index ccd7917..e2426e8 100644
</span>
//Allocate
for(int i = 0; i < d_resource_blocks.number; i++)
<span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -775,7 +775,7 @@ namespace gr {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ recv_snr();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ send_allocation();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- d_amplitude_out = (1.0+1.0i)*d_amplitude_abs;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ d_amplitude_out = gr_complex(1.0,1.0)*d_amplitude_abs;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ d_amplitude[d_allocation_out.id]=d_amplitude_abs;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // now generate outputs
</span> diff --git a/lib/autocorrelator_stage1_impl.cc b/lib/autocorrelator_stage1_impl.cc
index 61d6609..fd95a8e 100644
--- a/lib/autocorrelator_stage1_impl.cc
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gr-ofdm/files/patch-complex_to_float_error.diff b/science/gr-ofdm/files/patch-complex_to_float_error.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 4c67b14ca8f..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gr-ofdm/files/patch-complex_to_float_error.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/lib/allocation_src_impl.cc b/lib/allocation_src_impl.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index ccd7917..10c789e 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/lib/allocation_src_impl.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/lib/allocation_src_impl.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -69,7 +69,7 @@ namespace gr {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ,d_power_limit(subcarriers)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ,d_data_rate(subcarriers*3)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ,d_gap(6.6)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ,d_amplitude_out(1.0 + 1.0i)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ,d_amplitude_out(1.0+1.0) // should be enought to fix '_Complex double' to 'float' error
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ,d_amplitude_abs(1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span></pre><pre style='margin:0'>
</pre>