<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/6d15705eec484a81f017dde41c4ab93252260953">https://github.com/macports/macports-ports/commit/6d15705eec484a81f017dde41c4ab93252260953</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 6d15705 gr-ofdm: update to 8c0f81c3 (20170823).
</span><span style='display:block; white-space:pre;color:#404040;'> new 1c391a2 Merge branch 'master' of https://github.com/macports/macports-ports
</span>6d15705 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 6d15705eec484a81f017dde41c4ab93252260953
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Thu Aug 31 07:51:54 2017 -0400
<span style='display:block; white-space:pre;color:#404040;'> gr-ofdm: update to 8c0f81c3 (20170823).
</span>---
science/gr-ofdm/Portfile | 9 +-
science/gr-ofdm/files/patch-build-clang_c++11.diff | 98 +++++-----------------
2 files changed, 26 insertions(+), 81 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 c99a739..c7e7943 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;'>@@ -6,11 +6,10 @@ PortGroup github 1.0
</span> PortGroup active_variants 1.1
PortGroup cxx11 1.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup rwth-ti gr-ofdm ac623e857d8e7abc93403759ee43038ff0f142a0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 20161220
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 f2565d3e16dcc2f7e419679db7d3974d86b2949d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 558b67087086496564662c24d6df97bd0d45244a697f49bcade5623bd7499a5c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup rwth-ti gr-ofdm 8c0f81c38a67439df9f2d7b03d5cf31cb4e8d859
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 20170823
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 d3fec2c94ad038c4ac333e21a398a1978e5ff932 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 450928a83a9c5f4bdb8159fa59d8037cdc08973ff580c8979bdbf90c0eef2587
</span>
# allow gr-ofdm to work with both gnuradio and gnuradio-devel ...
<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 d8407d3..42d3fb0 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;'>@@ -1,5 +1,5 @@
</span> diff --git a/CMakeLists.txt b/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index a21dfde..48b8f3c 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 824108d..facc660 100644
</span> --- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -57,7 +57,7 @@ set(Boost_ADDITIONAL_VERSIONS
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1433,47 +1433,6 @@ index 0488d73..085eae7 100644
</span> x2 *= x1;
x0 = __builtin_ia32_addsubps( x0, x2 );
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/include/ofdm/ofdmi_mod.h b/include/ofdm/ofdmi_mod.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index ce828a4..896f86b 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/include/ofdm/ofdmi_mod.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/include/ofdm/ofdmi_mod.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -207,10 +207,10 @@ private:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const generic_modulation_scheme<3> mod;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- static const float d_pi_8 = M_PI / 8.0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- static const float d_7pi_8 = 7.0 * M_PI / 8.0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- static const float d_3pi_8 = 3.0 * M_PI / 8.0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- static const float d_5pi_8 = 5.0 * M_PI / 8.0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const float d_pi_8 = M_PI / 8.0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const float d_7pi_8 = 7.0 * M_PI / 8.0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const float d_3pi_8 = 3.0 * M_PI / 8.0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const float d_5pi_8 = 5.0 * M_PI / 8.0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- public:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- inline m8psk_scheme() : modulation_scheme(3) {};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -250,7 +250,7 @@ class m16qam_scheme : public modulation_scheme
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- private:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const generic_modulation_scheme<4> mod;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- static const float level_0 = 0.6325;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const float level_0 = 0.6325;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- public:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- inline m16qam_scheme() : modulation_scheme(4) {};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -350,9 +350,9 @@ class m64qam_scheme : public modulation_scheme
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- private:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const generic_modulation_scheme<6> mod;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- static const float level = 0.3086;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- static const float level2 = 0.3086*2.0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- static const float level3 = 0.3086*3.0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const float level = 0.3086;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const float level2 = 0.3086*2.0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const float level3 = 0.3086*3.0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- public:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- inline m64qam_scheme() : modulation_scheme(6) {};
</span> diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 959c59c..f3a83b9 100644
--- a/lib/CMakeLists.txt
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1529,20 +1488,20 @@ index 5c820ae..4fa6e3a 100644
</span>
} /* namespace ofdm */
diff --git a/lib/allocation_buffer_impl.cc b/lib/allocation_buffer_impl.cc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index a8368e6..5b7bc1c 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 57e8db7..050dadc 100644
</span> --- a/lib/allocation_buffer_impl.cc
+++ b/lib/allocation_buffer_impl.cc
@@ -51,7 +51,7 @@ namespace gr {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- , d_data_symbols(data_symbols)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- , d_allocation_buffer(256) //TODO: id size hardcoded
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ,d_coding( coding )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ,d_bitspermode( {1,2,3,4,6,8,9,10,12})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ,d_bitspermode{1,2,3,4,6,8,9,10,12}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ,d_data_symbols(data_symbols)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ,d_allocation_buffer(256) //TODO: id size hardcoded
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ,d_coding( coding )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ,d_bitspermode( {1,2,3,4,6,8,9,10,12})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ,d_bitspermode{1,2,3,4,6,8,9,10,12}
</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 17dc029..84c8c9b 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index ccd7917..fb4b865 100644
</span> --- a/lib/allocation_src_impl.cc
+++ b/lib/allocation_src_impl.cc
@@ -62,8 +62,8 @@ namespace gr {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1602,7 +1561,7 @@ index 61d6609..fd95a8e 100644
</span>
x0 = __builtin_ia32_addsubps( x0, x2 );
diff --git a/lib/autocorrelator_stage2_impl.cc b/lib/autocorrelator_stage2_impl.cc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 93b5240..d897b4c 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index c967bec..77a5263 100644
</span> --- a/lib/autocorrelator_stage2_impl.cc
+++ b/lib/autocorrelator_stage2_impl.cc
@@ -26,6 +26,7 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1613,17 +1572,6 @@ index 93b5240..d897b4c 100644
</span>
namespace gr {
namespace ofdm {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -78,8 +79,8 @@ namespace gr {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- float acc2 = d_acc2;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // use references for simpler access
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- float & x = acc1.real();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- float & y = acc1.imag();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const float & x = acc1.real();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const float & y = acc1.imag();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // NOTE: GCC performs better if we use temporary constants for
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // every expression
</span> diff --git a/lib/channel_equalizer_impl.cc b/lib/channel_equalizer_impl.cc
index f77323c..031a077 100644
--- a/lib/channel_equalizer_impl.cc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1897,21 +1845,19 @@ index eac25ca..13cc801 100644
</span> {
set_relative_rate(1.0/6.0);
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/lib/schmidl_tm_rec_stage2_impl.cc b/lib/schmidl_tm_rec_stage2_impl.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 60835db..ce128af 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/lib/schmidl_tm_rec_stage2_impl.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/lib/schmidl_tm_rec_stage2_impl.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -81,8 +81,8 @@ namespace gr {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- float acc3 = d_acc3;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // use references for simpler access
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- float & x = acc1.real();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- float & y = acc1.imag();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const float & x = acc1.real();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const float & y = acc1.imag();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // NOTE: GCC performs better if we use temporary constants for
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // every expression
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/lib/repetition_encoder_sb_impl.cc b/lib/repetition_encoder_sb_impl.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 95b4eb3..b1124ee 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/lib/repetition_encoder_sb_impl.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/lib/repetition_encoder_sb_impl.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -90,7 +90,7 @@ namespace gr {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //and write it bit by bit to the output
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (unsigned short bit = 0; bit < d_input_bits; bit++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- out[output_pos++] = ((char)(in[item] >> bit)) & 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ out[output_pos++] = (((char)(in[item] >> bit)) & 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ^ d_whitener[reps*d_input_bits+bit];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> diff --git a/lib/util_bmp.cc b/lib/util_bmp.cc
index e151a10..e29b4ed 100644
--- a/lib/util_bmp.cc
</pre><pre style='margin:0'>
</pre>