<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/94e4e1dd0b8e2aba9655d58929918a28cb9e0306">https://github.com/macports/macports-ports/commit/94e4e1dd0b8e2aba9655d58929918a28cb9e0306</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 94e4e1d gnuradio: update all subports to latest
</span>94e4e1d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 94e4e1dd0b8e2aba9655d58929918a28cb9e0306
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Mon Apr 2 16:22:02 2018 -0400
<span style='display:block; white-space:pre;color:#404040;'> gnuradio: update all subports to latest
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> + release to 3.7.12.0, devel to e4acf4f2 (20180330), and next to e0beb54a (20180305).
</span><span style='display:block; white-space:pre;color:#404040;'> + fix patches, which were accidentally removed in 5ef8f1506ea2059f836f410d824f469db8d8a6b2 (my bad);
</span><span style='display:block; white-space:pre;color:#404040;'> + requires Volk 1.4 API.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: trac.macports.org/ticket/56206
</span>---
science/gnuradio/Portfile | 91 ++++++++---------------------------------------
1 file changed, 14 insertions(+), 77 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 0e966da..a8bbafa 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;'>@@ -24,11 +24,11 @@ dist_subdir gnuradio
</span>
if {${subport} eq ${name}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup gnuradio gnuradio 3.7.11 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup gnuradio gnuradio 3.7.12.0 v
</span> checksums \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 7c361e19ccacd78f8a1e947b3307f8665d0bc0d2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 6f796788606eda4a6b947c627a22f00575c6026464b95e05f897bdafd9a1a4fa
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 a2a8ccfaf4ff91d456380357e9e596e188db5953 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 6c84b58b947d10c1788d81f48c066ecba1c302d7b3eff21b3a102444b39d115b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 4429814
</span>
long_description ${description}: \
This port is kept up with the GNU Radio release, currently ${version}, which is typically updated every few months.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,13 +54,12 @@ subport gnuradio-devel {
</span> name gnuradio-devel
conflicts gnuradio gnuradio-next
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup gnuradio gnuradio 713629cce8d571570bc5f0f0db67c5a96d5ee071
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20180306
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup gnuradio gnuradio e4acf4f2f0623fa3ef25dae234b22293d94cd89a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20180330
</span> checksums \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 a89ada7ed0e8419a49fe3735e84232e0f4ce41b3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 bae213791526151aaf46d5e7f0175cfb6fe7cd0a58e31337ed0c96f16a2c5173 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 4421012
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 a2a8ccfaf4ff91d456380357e9e596e188db5953 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 6c84b58b947d10c1788d81f48c066ecba1c302d7b3eff21b3a102444b39d115b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 4429814
</span>
# set the version override string
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -76,13 +75,12 @@ subport gnuradio-next {
</span> name gnuradio-next
conflicts gnuradio gnuradio-devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup gnuradio gnuradio 9ae5d4cd3da84ce7e5a0c2abe7fec1ff8d229ae8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20180303
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup gnuradio gnuradio e0beb54aac18de2f1c3f5076213f03bbe096cd59
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20180305
</span> checksums \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 92a27ac0c237092208f702c914a249b5b121f374 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 a04c6f71c6369f0df941da7b92d6f88804b0f05ff8925d82798be8ac107eb046 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3621723
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 5ed1ef2625d32778e1e6170ee80230967bd7e644 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 51b780e1e62ddfb9780ba9dd78acd196841569cdda4186366e9b681fce8a8cf8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3622070
</span>
# set the version override string
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -94,15 +92,6 @@ subport gnuradio-next {
</span>
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# is volk or volk-devel installed?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# this is required for an API change in Volk, which will either
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# require a patch (for volk-devel) or not (for volk)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set use_volk_release 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![catch {set installed [lindex [registry_active volk-devel] 0]}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set use_volk_release 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> if {${subport} eq "gnuradio"} {
# patches for release only
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -111,52 +100,6 @@ if {${subport} eq "gnuradio"} {
</span> patchfiles-append \
patch-cmake-expand.release.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # temporary patch to fix debug printout in gr-audio/osx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # delete at next release update
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-gr-audio_lib_osx_osx_impl.cc.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Fix setting of the C++ standard internal to GR, with internal
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # checking depending on version of CppUnit & allowing MacPorts to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # decide the setting.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # temporary patch to fix gr-fec to switch code from 'constexpr' to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # just 'const'; this patch is already integrated upstream, so
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # remove with the next release.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-gr-fec_include_gnuradio_fec_polar_decoder_common.h.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # temporary patch to fix logging macros to work more robustly with
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # out-of-tree modules.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # integrated into devel and next, so remove at next release
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-logging_macros.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # temporary patch to fix gr OSX audio for debugging
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # integrated into devel and next, so remove at next release
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-gr-audio_fix_debug.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # temporary patch to add in a macro that overloads the function
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include_directories to be a little smarter as to the ordering of
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # the directories, sorting them to be internal to build or source
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # first and external last.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-add-CMakeOverloads.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # temporary patch to fix FindCppUnit.cmake to return version found
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # to calling script.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-cmake_Modules_FindCppUnit.cmake.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${use_volk_release} == 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # temporary patch to fix new Volk API
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-volk-devel-API.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> } elseif {${subport} eq "gnuradio-devel"} {
# patches for devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -165,12 +108,6 @@ if {${subport} eq "gnuradio"} {
</span> patchfiles-append \
patch-cmake-expand.devel.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${use_volk_release} == 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # temporary patch to fix new Volk API
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-volk-devel-API.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> } else {
# patches for next
</pre><pre style='margin:0'>
</pre>