<pre style='margin:0'>
ra1nb0w (ra1nb0w) pushed a commit to branch gnuradio-3.10
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e760e79228e407bc2bf5f4eadb044558a89020b9">https://github.com/macports/macports-ports/commit/e760e79228e407bc2bf5f4eadb044558a89020b9</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit e760e79228e407bc2bf5f4eadb044558a89020b9
</span>Author: Davide Gerhard <ra1nb0w@macports.org>
AuthorDate: Fri Feb 11 11:47:37 2022 +0100

<span style='display:block; white-space:pre;color:#404040;'>    gnuradio-1.0.tcl: update deps for gnuradio 3.10.1.1
</span>---
 _resources/port1.0/group/gnuradio-1.0.tcl | 46 +++++++++++++++++++++----------
 1 file changed, 32 insertions(+), 14 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/gnuradio-1.0.tcl b/_resources/port1.0/group/gnuradio-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 899314d37b0..f8a8ce71485 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/gnuradio-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/gnuradio-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,16 +24,20 @@ options gnuradio.default_python_variant
</span> if {[string first "37" $subport] > 1} {
     default gnuradio.python_versions { 2.7 }
     default gnuradio.default_python_variant +python27
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    # use C/C++11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    compiler.c_standard   2011
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    compiler.cxx_standard 2011
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    boost.version 1.71
</span> } else {
     # the following versions use all the same python
     default gnuradio.python_versions { 3.8 3.9 3.10 }
     default gnuradio.default_python_variant +python39
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    # use C/C++17
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    compiler.c_standard   2011
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    compiler.cxx_standard 2017
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    boost.version 1.76
</span> }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# use C/C++11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.c_standard   2011
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.cxx_standard 2011
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-boost.version 1.71
</span> 
 # see https://github.com/macports/macports-ports/pull/7805
 license_noconflict-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -93,6 +97,9 @@ depends_run-append \
</span>     port:py${active_python_version_no_dot}-opengl \
     port:py${active_python_version_no_dot}-scipy
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# specify the Python version to use
</span><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;'>+
</span> if {[string first "37" $subport] > 1} {
     # still require cppunit for testing; NOTE: cppunit is checked for
     # during configure, so we need it to be in depends_lib or
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -105,12 +112,12 @@ if {[string first "37" $subport] > 1} {
</span>     configure.args-append \
         -DSWIG_EXECUTABLE=${prefix}/bin/swig3
 } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    # add dependencies for gnuradio >= 3.8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     depends_build-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        port:swig-python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # add dependencies for gnuradio >= 3.10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        port:py${active_python_version_no_dot}-pybind11
</span> 
     configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        -DSWIG_EXECUTABLE=${prefix}/bin/swig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        -Dpybind11_DIR=${python_framework_dir}/lib/python${active_python_version}/site-packages/pybind11/share/cmake/pybind11
</span> }
 
 if {[string first "gr37-" $subport] >= 0} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -129,9 +136,8 @@ if {[variant_isset debug]} {
</span>     cmake.build_type Release
 }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# specify the Python version to use
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set python_framework_dir ${frameworks_dir}/Python.framework/Versions/${active_python_version}
</span> configure.args-append \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    -DENABLE_PYTHON=ON \
</span>     -DPYTHON_EXECUTABLE=${python_framework_dir}/bin/python${active_python_version} \
     -DPYTHON_INCLUDE_DIR=${python_framework_dir}/Headers \
     -DPYTHON_LIBRARY=${python_framework_dir}/Python \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -147,7 +153,8 @@ configure.args-append \
</span>     -DMPIRXX_LIBRARY=${prefix}/lib/libmpirxx.dylib \
     -DENABLE_DOXYGEN=OFF \
     -DENABLE_SPHINX=OFF \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    -DSPHINX_EXECUTABLE=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    -DSPHINX_EXECUTABLE= \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    -DENABLE_MANPAGES=OFF
</span> 
 # remove top-level library and include paths, such that internal ones
 # are searched before any already-installed ones.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -164,14 +171,24 @@ configure.args-append \
</span>     -DCMAKE_C_EXTENSIONS=OFF
 
 variant docs description "Install documentation" {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    # texlive-latex not needed from 3.9.0.0
</span>     depends_build-append \
         port:doxygen \
         path:bin/dot:graphviz \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        port:py${active_python_version_no_dot}-sphinx \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        port:texlive-latex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        port:py${active_python_version_no_dot}-sphinx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # texlive-latex not needed from 3.9.0.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {[string first "37" $subport] > 1} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            port:texlive-latex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            port:mathjax2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            -DMATHJAX2_USE_ROOT=${prefix}/share/mathjax2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span> 
     configure.args-delete \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+        -DENABLE_MANPAGES=OFF \
</span>         -DENABLE_DOXYGEN=OFF \
         -DDOXYGEN_DOT_EXECUTABLE= \
         -DDOXYGEN_EXECUTABLE= \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -179,6 +196,7 @@ variant docs description "Install documentation" {
</span>         -DSPHINX_EXECUTABLE=
 
     configure.args-append \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+        -DENABLE_MANPAGES=ON \
</span>         -DENABLE_DOXYGEN=ON \
         -DDOXYGEN_DOT_EXECUTABLE=${prefix}/bin/dot \
         -DDOXYGEN_EXECUTABLE=${prefix}/bin/doxygen \
</pre><pre style='margin:0'>

</pre>