<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/62ed4d5792ef48c63c62bbe3a433e07dcfb63522">https://github.com/macports/macports-ports/commit/62ed4d5792ef48c63c62bbe3a433e07dcfb63522</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 62ed4d5 gr-specest-38: new subport
</span>62ed4d5 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 62ed4d5792ef48c63c62bbe3a433e07dcfb63522
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Wed May 22 16:19:43 2019 -0400
<span style='display:block; white-space:pre;color:#404040;'> gr-specest-38: new subport
</span>---
science/gr-specest/Portfile | 73 +++++++++++++++-------
...atch-fix_build.diff => patch-fix_build.37.diff} | 0
science/gr-specest/files/patch-fix_build.38.diff | 27 ++++++++
3 files changed, 76 insertions(+), 24 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gr-specest/Portfile b/science/gr-specest/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 31f847b..ec83496 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gr-specest/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gr-specest/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,12 +5,7 @@ PortGroup cmake 1.0
</span> PortGroup github 1.0
PortGroup compilers 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup kit-cel gr-specest 91a27336b19a65125483fe0424b16f31822e7c85
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 20180115
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 5b9614203006aa5ef497caccaa86dab2b40324b4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 3cdd50bc68a002509bb14d4ab0565736409c171b7fb443694dc2fbcecd6d4227
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name gr-specest
</span> categories science comms
maintainers {michaelld @michaelld} openmaintainer
description Provides spectral estimation blocks for GNU Radio.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,6 +13,54 @@ long_description ${description}
</span> license GPL-3
platforms darwin
<span style='display:block; white-space:pre;background:#e0ffe0;'>+subport gr-specest-38 {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${name} eq ${subport}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup kit-cel gr-specest 91a27336b19a65125483fe0424b16f31822e7c85
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20180115
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 5b9614203006aa5ef497caccaa86dab2b40324b4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 3cdd50bc68a002509bb14d4ab0565736409c171b7fb443694dc2fbcecd6d4227 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 562474
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # allow gr-specest to work with both gnuradio and gnuradio-devel ...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append path:lib/libgnuradio-runtime.dylib:gnuradio
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ... but not with gnuradio-next
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-fetch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![catch {set installed [lindex [registry_active gnuradio-next] 0]}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # gnuradio-next is installed; this version of gr-specest does not work with gnuradio-next
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_msg "\nError: ${name} requires the gnuradio or gnuradio-devel port, and will not work with the gnuradio-next port. deactivate gnuradio-next, and then install or activate gnuradio or gnuradio-devel.\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "Invalid port dependency: gnuradio-next"
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # patches
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-fix_build.37.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup kit-cel gr-specest 4ac4c4a9492df60f9202a91680a7bbbea564a2e4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20190520-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 3227c18ada41a7725a8457102a8f31f4052d00b3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 019a94a44be97e457ec73a4ed4971a1607431494228730ff742099ec306d643f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 568667
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # gr-specest-38 requires gnuradio-next ...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:gnuradio-next
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # patches
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-fix_build.38.diff
</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> # require a fortran compiler
#compilers.choose f77 f90
compilers.setup require_fortran
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,24 +82,6 @@ depends_run-append port:gr-osmosdr
</span> # not required for runtime; just for build/test.
depends_build-append port:cppunit
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# allow gr-specest to work with both gnuradio and gnuradio-devel ...
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append path:lib/libgnuradio-runtime.dylib:gnuradio
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# ... but not with gnuradio-next
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![catch {set installed [lindex [registry_active gnuradio-next] 0]}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # gnuradio-next is installed; this version of gr-specest does not work with gnuradio-next
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "\nError: ${name} requires the gnuradio or gnuradio-devel port, and will not work with the gnuradio-next port. deactivate gnuradio-next, and then install or activate gnuradio or gnuradio-devel.\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "Invalid port dependency: gnuradio-next"
</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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# patches
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-fix_build.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # do VPATH (out of source tree) build
cmake.out_of_source yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gr-specest/files/patch-fix_build.diff b/science/gr-specest/files/patch-fix_build.37.diff
</span>similarity index 100%
rename from science/gr-specest/files/patch-fix_build.diff
rename to science/gr-specest/files/patch-fix_build.37.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gr-specest/files/patch-fix_build.38.diff b/science/gr-specest/files/patch-fix_build.38.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..d10371c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gr-specest/files/patch-fix_build.38.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,27 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/cyclo_fam_calcspectrum_algo.cc.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/cyclo_fam_calcspectrum_algo.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -97,12 +97,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Copy input stream to d_complex_demodulates and do the phase shifting
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (int m = 0; m < d_P * d_Np; m++) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- d_complex_demodulates[p][i].real(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- in[m].real() * cos(2 * M_PI * i * (p * d_L) / d_Np) +
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- in[m].imag() * sin(2 * M_PI * i * (p * d_L) / d_Np));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- d_complex_demodulates[p][i].imag(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- in[m].imag() * cos(2 * M_PI * i * (p * d_L) / d_Np) -
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- in[m].real() * sin(2 * M_PI * i * (p * d_L) / d_Np));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ d_complex_demodulates[p][i] = in[m] * gr_complex (cos(2*M_PI*i*(p*d_L)/d_Np), -sin(2*M_PI*i*(p*d_L)/d_Np));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ i++;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((m + 1) % d_Np == 0) { // End of vector length Np
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/pad_vector_impl.cc.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/pad_vector_impl.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -39,7 +39,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gr::io_signature::make(1, 1, vlen_in * item_size),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gr::io_signature::make(1, 1, vlen_out * item_size))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (item_size, vlen_in < vlen_out) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (vlen_in < vlen_out) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ d_copylen = vlen_in * item_size;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ d_padlen = (vlen_out - vlen_in) * item_size;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span></pre><pre style='margin:0'>
</pre>