<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/18fa44877651d4ceac9869fd9824273506b17ab3">https://github.com/macports/macports-ports/commit/18fa44877651d4ceac9869fd9824273506b17ab3</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 18fa448 volk-gnss-sdr: add Python variants and update volk-gnss-sdr-next subport
</span>18fa448 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 18fa44877651d4ceac9869fd9824273506b17ab3
</span>Author: Carles Fernandez <carles.fernandez@gmail.com>
AuthorDate: Sun Dec 1 02:13:14 2019 +0100
<span style='display:block; white-space:pre;color:#404040;'> volk-gnss-sdr: add Python variants and update volk-gnss-sdr-next subport
</span>---
science/gnss-sdr/Portfile | 14 ++++-----
science/volk-gnss-sdr/Portfile | 68 +++++++++++++++++++++++++++++++++++-------
2 files changed, 65 insertions(+), 17 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gnss-sdr/Portfile b/science/gnss-sdr/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1277136..b0ebb9b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gnss-sdr/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gnss-sdr/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,7 +39,7 @@ if {${subport} eq "gnss-sdr"} {
</span> checksums rmd160 c280bf809e1e99187a1d060684f06d9b2f6aeb7f \
sha256 0c55b5cd971f308d734b00c7d68e3c43fc25fcf787b40b330b04ca624d3583d1 \
size 3716114
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 3
</span>
conflicts gnss-sdr-devel gnss-sdr-next
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,7 +60,7 @@ subport gnss-sdr-devel {
</span> checksums rmd160 c280bf809e1e99187a1d060684f06d9b2f6aeb7f \
sha256 0c55b5cd971f308d734b00c7d68e3c43fc25fcf787b40b330b04ca624d3583d1 \
size 3716114
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 3
</span>
conflicts gnss-sdr gnss-sdr-next
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -75,11 +75,11 @@ subport gnss-sdr-next {
</span> This port is kept up with the GNSS-SDR GIT next branch, which is typically updated daily to weekly. This version of GNSS-SDR generally contains fixes and new features that will be incorporated in an upcoming release, and compiles against the gnuradio-next subport. This port may or not compile or function correctly, as it represents a work in progress. If it does not work, check back in a few days. Or try deactivating the currently active gnss-sdr and gnuradio ports, cleaning a [...]
name gnss-sdr-next
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup gnss-sdr gnss-sdr 124531ba39f5f280bb984a4b3fe11863d639a385
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20191027-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 f53b95bfe66e479218176a17cadc64f8eb81aac0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 d07dbbd90551e85ddc15d0a0c01ca608f1de875f50df381e4cd64458358abb3b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3754796
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup gnss-sdr gnss-sdr 39234295d71b33a4e01b44147e837ff2aa0edd11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20191201-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 682fe7a087e6a5cca2e15537f49b2cefea4dd4c9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 1afd38c63bd2df2dd744344da41162f9586d3b65b2be2cd2f019f311d47fba0f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3761297
</span> revision 0
conflicts gnss-sdr gnss-sdr-devel
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/volk-gnss-sdr/Portfile b/science/volk-gnss-sdr/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2f650be..b21f067 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/volk-gnss-sdr/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/volk-gnss-sdr/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,7 +36,7 @@ if {${subport} eq "volk-gnss-sdr"} {
</span> This port is kept up with the VOLK-GNSS-SDR release, which is typically updated every few months. This version compiles against the gnss-sdr and gnuradio ports.
github.setup gnss-sdr gnss-sdr 0.0.11 v
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 2
</span> checksums rmd160 c280bf809e1e99187a1d060684f06d9b2f6aeb7f \
sha256 0c55b5cd971f308d734b00c7d68e3c43fc25fcf787b40b330b04ca624d3583d1 \
size 3716114
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,7 +56,7 @@ subport volk-gnss-sdr-devel {
</span> checksums rmd160 c280bf809e1e99187a1d060684f06d9b2f6aeb7f \
sha256 0c55b5cd971f308d734b00c7d68e3c43fc25fcf787b40b330b04ca624d3583d1 \
size 3716114
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 2
</span>
conflicts volk-gnss-sdr volk-gnss-sdr-next
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,11 +67,11 @@ subport volk-gnss-sdr-next {
</span> This port is kept up with the VOLK-GNSS-SDR GIT next branch, which is typically updated daily to weekly. This version of VOLK-GNSS-SDR generally contains fixes and new features that will be incorporated in an upcoming release, and compiles against the gnss-sdr-next and gnuradio-next ports. This port may or not compile or function correctly, as it represents a work in progress. If it does not work, check back in a few days. Or try deactivating the currently active gnss-sdr and [...]
name volk-gnss-sdr-next
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup gnss-sdr gnss-sdr 124531ba39f5f280bb984a4b3fe11863d639a385
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20191027-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 f53b95bfe66e479218176a17cadc64f8eb81aac0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 d07dbbd90551e85ddc15d0a0c01ca608f1de875f50df381e4cd64458358abb3b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3754796
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup gnss-sdr gnss-sdr 39234295d71b33a4e01b44147e837ff2aa0edd11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20191201-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 682fe7a087e6a5cca2e15537f49b2cefea4dd4c9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 1afd38c63bd2df2dd744344da41162f9586d3b65b2be2cd2f019f311d47fba0f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3761297
</span> revision 0
conflicts volk-gnss-sdr volk-gnss-sdr-devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -94,11 +94,59 @@ depends_build-append port:pkgconfig
</span> depends_lib-append \
path:lib/libvolk.dylib:volk \
port:orc \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:python27 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-mako \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-six \
</span> port:boost
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# specify the Python dependencies; these are checked for at configure,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# then used for building, but not at runtime.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set pythons_suffixes {27 36 37 38}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set pythons_ports {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach s ${pythons_suffixes} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend pythons_ports python${s}
</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;'>+proc python_dir {} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global pythons_suffixes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach s ${pythons_suffixes} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset python${s}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set p python[string index ${s} 0].[string index ${s} 1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return [file normalize [exec ${p} -c "import sys; print(sys.prefix)"]/lib/${p}/site-packages]
</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;'>+ error "Python support not enabled."
</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;'>+foreach s ${pythons_suffixes} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set p python${s}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set v [string index ${s} 0].[string index ${s} 1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set i [lsearch -exact ${pythons_ports} ${p}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set c [lreplace ${pythons_ports} ${i} ${i}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant ${p} description "Build Volk using Python ${v}" conflicts {*}${c} "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # required Python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:${p}
</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${s}-six \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${s}-mako
</span><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;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_EXECUTABLE=${frameworks_dir}/Python.framework/Versions/${v}/bin/python${v} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DVOLK_PYTHON_DIR=${frameworks_dir}/Python.framework/Versions/${v}/lib/python${v}/site-packages
</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;'>+if {![variant_isset debug]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set selected_python python37
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach s ${pythons_suffixes} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset python${s}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set selected_python python${s}
</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;'>+ default_variants +${selected_python}
</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> # do VPATH (out of source tree) build
cmake.out_of_source yes
</pre><pre style='margin:0'>
</pre>