<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/7e07b9eb57c6c779aca76ca8d82c85eb1c0f5948">https://github.com/macports/macports-ports/commit/7e07b9eb57c6c779aca76ca8d82c85eb1c0f5948</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 7e07b9eb57c6c779aca76ca8d82c85eb1c0f5948
</span>Author: Davide Gerhard <ra1nb0w@macports.org>
AuthorDate: Fri Apr 10 21:47:30 2020 +0200
<span style='display:block; white-space:pre;color:#404040;'> gr-specest: support gnuradio 3.8 and create subport for GR 3.7
</span>---
science/gr-specest/Portfile | 149 +++++++++++++----------
science/gr-specest/files/patch-fix_build.38.diff | 27 ----
2 files changed, 84 insertions(+), 92 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 ec834962ce3..d162f5af156 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;'>@@ -1,7 +1,7 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup cmake 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.1
</span> PortGroup github 1.0
PortGroup compilers 1.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,97 +13,116 @@ long_description ${description}
</span> license GPL-3
platforms darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport gr-specest-38 {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# use C++11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2011
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${name} eq ${subport}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} eq ${name}} {
</span>
<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;'>- size 562474
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup kit-cel gr-specest fe599836c38e2a858c1ae0703ebd006a2fe9edae
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20191014-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 9b44d1d1b49a1d7624115ae76bbc539b91a96783 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 63b75c426f14b9d0b817cdfbc58724e8c44c4d590217943792a6d30a12cf8e34 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 568696
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span>
<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:#e0ffe0;'>+ conflicts gr37-specest
</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:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/libgnuradio-runtime.dylib:gnuradio \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gr-osmosdr
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # ... but not with gnuradio-next
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set python_versions { 3.6 3.7 3.8 }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set default_python_variant +python37
</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:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # patches
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport gr37-specest {
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-fix_build.37.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ name gr37-specest
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</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 0
</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:#ffe0e0;'>- github.setup kit-cel gr-specest 4ac4c4a9492df60f9202a91680a7bbbea564a2e4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20190520-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 3227c18ada41a7725a8457102a8f31f4052d00b3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 019a94a44be97e457ec73a4ed4971a1607431494228730ff742099ec306d643f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 568667
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts gr-specest
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # gr-specest-38 requires gnuradio-next ...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-fix_build.37.diff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:gnuradio-next
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gnuradio37 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gr37-osmosdr
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # patches
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set python_versions { 2.7 }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set default_python_variant +python27
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 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;'>+# Define the available variants
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach py_ver ${python_versions} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set py_ver_no_dot [join [split ${py_ver} "."] ""]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set variant_line {variant python${py_ver_no_dot} description "Build with python ${py_ver} support"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach py_over ${python_versions} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${py_ver} == ${py_over} } { continue }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set py_over_no_dot [join [split ${py_over} "."] ""]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ append variant_line " conflicts python${py_over_no_dot}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ append variant_line { { } }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ eval $variant_line
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset python${py_ver_no_dot}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${default_python_variant} != "+python${py_ver_no_dot}"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set default_python_variant ""
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# set default python variant if not selected
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${default_python_variant} != ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append "${default_python_variant}"
</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;'>+# If a python variant is enabled, activate it
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set active_python_version ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set active_python_version_no_dot ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach py_ver ${python_versions} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set py_ver_no_dot [join [split ${py_ver} "."] ""]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset python${py_ver_no_dot}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set active_python_version ${py_ver}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set active_python_version_no_dot ${py_ver_no_dot}
</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:#ffe0e0;'>-depends_build-append port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:swig-python
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:boost \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:doxygen \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libxml2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:armadillo \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:fftw-3-single
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_run-append port:gr-osmosdr
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# still require cppunit for testing; NOTE: cppunit is checked for
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# during configure, so we need it to be in depends_lib or
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# depends_build to be used correctly. Choose the latter since it's
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# not required for runtime; just for build/test.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build-append port:cppunit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# do VPATH (out of source tree) build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-cmake.out_of_source yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# remove top-level library path, such that internal libraries are used
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# instead of any already-installed ones.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.ldflags-delete -L${prefix}/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# specify the Python dependencies
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:swig-python \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:doxygen \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:cppunit
</span>
depends_lib-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:python27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:boost \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libxml2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:armadillo \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:fftw-3-single \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python${active_python_version_no_dot}
</span>
# specify the Python version to use
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_framework_dir ${frameworks_dir}/Python.framework/Versions/${active_python_version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_EXECUTABLE=${python_framework_dir}/bin/python${active_python_version} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_INCLUDE_DIR=${python_framework_dir}/Headers \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_LIBRARY=${python_framework_dir}/Python \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DGR_PYTHON_DIR=${python_framework_dir}/lib/python${active_python_version}/site-packages
</span>
configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_EXECUTABLE=${frameworks_dir}/Python.framework/Versions/2.7/bin/python2.7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_INCLUDE_DIR=${frameworks_dir}/Python.framework/Versions/2.7/Headers \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_LIBRARY=${frameworks_dir}/Python.framework/Versions/2.7/Python \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DGR_PYTHON_DIR=${frameworks_dir}/Python.framework/Versions/2.7/lib/python2.7/site-packages \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCMAKE_MODULES_DIR=${prefix}/share/cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DDOXYGEN_DOT_EXECUTABLE=${prefix}/bin/dot \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DDOXYGEN_EXECUTABLE=${prefix}/bin/doxygen
</span>
variant accelerate conflicts atlas openblas description {Use Apple Accelerate Libraries for BLAS} {
configure.env-append BLA_VENDOR=Apple
<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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index d10371c6baf..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gr-specest/files/patch-fix_build.38.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,27 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/cyclo_fam_calcspectrum_algo.cc.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/cyclo_fam_calcspectrum_algo.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -97,12 +97,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Copy input stream to d_complex_demodulates and do the phase shifting
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for (int m = 0; m < d_P * d_Np; m++) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- d_complex_demodulates[p][i].real(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- in[m].real() * cos(2 * M_PI * i * (p * d_L) / d_Np) +
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- in[m].imag() * sin(2 * M_PI * i * (p * d_L) / d_Np));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- d_complex_demodulates[p][i].imag(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- in[m].imag() * cos(2 * M_PI * i * (p * d_L) / d_Np) -
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- in[m].real() * sin(2 * M_PI * i * (p * d_L) / d_Np));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 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:#ffe0e0;'>- i++;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ((m + 1) % d_Np == 0) { // End of vector length Np
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/pad_vector_impl.cc.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/pad_vector_impl.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -39,7 +39,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gr::io_signature::make(1, 1, vlen_in * item_size),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gr::io_signature::make(1, 1, vlen_out * item_size))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (item_size, vlen_in < vlen_out) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (vlen_in < vlen_out) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- d_copylen = vlen_in * item_size;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- d_padlen = (vlen_out - vlen_in) * item_size;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span></pre><pre style='margin:0'>
</pre>