<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/34399670f65f679616c4a854bf963a1454d9608f">https://github.com/macports/macports-ports/commit/34399670f65f679616c4a854bf963a1454d9608f</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 3439967 gnuradio: update devel to a098720f (20180220) and next to 11469b11 (20180222).
</span>3439967 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 34399670f65f679616c4a854bf963a1454d9608f
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Tue Feb 27 08:05:22 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> gnuradio: update devel to a098720f (20180220) and next to 11469b11 (20180222).
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> + add patch to deal with Volk API change, which will be used for those using volk-devel only, not the volk release.
</span><span style='display:block; white-space:pre;color:#404040;'> + a little whitespace;
</span><span style='display:block; white-space:pre;color:#404040;'> + a few comments about what a patch does.
</span>---
science/gnuradio/Portfile | 54 ++++++++++++++++++------
science/gnuradio/files/patch-volk-devel-API.diff | 11 +++++
2 files changed, 52 insertions(+), 13 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gnuradio/Portfile b/science/gnuradio/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0d6fc7a..820cfa5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gnuradio/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gnuradio/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,16 +54,16 @@ subport gnuradio-devel {
</span> name gnuradio-devel
conflicts gnuradio gnuradio-next
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup gnuradio gnuradio 76f8abeb0e88ff4063909f0f502cf7cfe22e5640
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20180218
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup gnuradio gnuradio a098720f430fae36fbd28d7e9c1548a1e6c4fdf4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20180220
</span> checksums \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 150489f095fb277a2a9e61c3d8ab45dac21251ed \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 110914dc06d480242049ecf473a70e0964973d1abed43b36acaa5fc480eadfe7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 aec77c389c1c8129a66356de416fe33d545da21f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 da880cbe6f77e3e7e3c615797b0c21aa178e6af85e2f7537e216e718d69d4990
</span>
# set the version override string
set GR_VERSION_INFO "devel-git-[string range ${github.version} 0 7](${version})"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> }
subport gnuradio-next {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -74,11 +74,11 @@ subport gnuradio-next {
</span> name gnuradio-next
conflicts gnuradio gnuradio-devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup gnuradio gnuradio 98753b64483fc8bfc65cbf55f2f680ff16bdb9d7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20180211
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup gnuradio gnuradio 11469b11d4391fd5af0a4edd3d46b2e02a7d7799
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20180222
</span> checksums \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 13ced32819f55d6cf4d55cc51ae7e690973d4f9f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 3de5e685e0d50747c9441124596502b51804cd0f59a8ec24249b8485ac1034e2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 225b63c866be0e2e3a9a1ee60fcbf2f13e655d56 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 ccea65493cdb139a9fbbfb4a88810dc6a80e97681df07d7f736f33e6c02cd419
</span>
# set the version override string
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -90,13 +90,20 @@ subport gnuradio-next {
</span>
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# temporary patch to fix header creation to be before dependencies
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# are determined, such that local (to the build) headers are found
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# before already-installed ones.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# is volk or volk-devel installed?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# this is required for an API change in Volk, which will either
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# require a patch (for volk-devel) or not (for volk)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set use_volk_release 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![catch {set installed [lindex [registry_active volk-devel] 0]}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set use_volk_release 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
if {${subport} eq "gnuradio"} {
# patches for release only
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # force expansion of CMake-based template files
</span> patchfiles-append \
patch-cmake-expand.release.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -140,22 +147,43 @@ if {${subport} eq "gnuradio"} {
</span>
patchfiles-append patch-cmake_Modules_FindCppUnit.cmake.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${use_volk_release} == 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # temporary patch to fix new Volk API
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-volk-devel-API.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> } elseif {${subport} eq "gnuradio-devel"} {
# patches for devel
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # force expansion of CMake-based template files
</span> patchfiles-append \
patch-cmake-expand.devel.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${use_volk_release} == 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # temporary patch to fix new Volk API
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-volk-devel-API.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> } else {
# patches for next
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # force expansion of CMake-based template files
</span> patchfiles-append \
patch-cmake-expand.next.diff
# temporary patch to fix include order
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> patchfiles-append patch-fix_includes.next.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${use_volk_release} == 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # temporary patch to fix new Volk API
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-volk-devel-API.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
platform darwin 10 {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gnuradio/files/patch-volk-devel-API.diff b/science/gnuradio/files/patch-volk-devel-API.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..38bf636
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gnuradio/files/patch-volk-devel-API.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gr-fec/lib/polar_decoder_common.cc.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gr-fec/lib/polar_decoder_common.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -125,7 +125,7 @@ namespace gr {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ polar_decoder_common::butterfly_volk(float* llrs, unsigned char* u, const int stage,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const int u_num, const int row)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- volk_32f_8u_polarbutterfly_32f(llrs, u, block_size(), block_power(), stage, u_num, row);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ volk_32f_8u_polarbutterfly_32f(llrs, u, block_power(), stage, u_num, row);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>