<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/b73659907f3e098b36a9704afb685af1e917d767">https://github.com/macports/macports-ports/commit/b73659907f3e098b36a9704afb685af1e917d767</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 b736599 [volk-]gnss-sdr: Update to version 0.0.10
</span>b736599 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b73659907f3e098b36a9704afb685af1e917d767
</span>Author: Carles Fernandez <carles.fernandez@gmail.com>
AuthorDate: Mon Apr 1 21:06:25 2019 +0200
<span style='display:block; white-space:pre;color:#404040;'> [volk-]gnss-sdr: Update to version 0.0.10
</span>---
science/gnss-sdr/Portfile | 79 +++++--------
science/gnss-sdr/files/patch-CMakeLists.txt.diff | 44 -------
.../gnss-sdr/files/patch-for_boost_1.67.devel.diff | 130 ---------------------
science/volk-gnss-sdr/Portfile | 38 +++---
4 files changed, 47 insertions(+), 244 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 fc727d6..4b6f98e 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;'>@@ -21,17 +21,12 @@ if {${subport} eq "gnss-sdr"} {
</span> long_description ${description}: \
This port is kept up with the GNSS-SDR release, which is typically updated every few months. This version compiles against the gnuradio port, which represents the current GNU Radio release.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup gnss-sdr gnss-sdr 0.0.9 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 10
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 695cab70f3fe597e53cc772bfb96096e6fe0d139 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 5110f66c8b8a63ee5db5569f0b1f8040f36e3541a3a249d08f3154bc05317184
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup gnss-sdr gnss-sdr 0.0.10 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 733c3211b163825be36db80d89f9fb0db0051264 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d44b32fd2bbdc703097e2368281d77ad4e2c42ec7c76c6e7ef100b014a716e3e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3575803
</span> github.tarball_from tags
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # github changed the way tarballs are generated
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # remove this at next update
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see also: https://trac.macports.org/ticket/54839
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dist_subdir ${name}/${version}_1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> conflicts gnss-sdr-devel gnss-sdr-next
depends_lib-append port:gnuradio port:volk-gnss-sdr
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,12 +41,11 @@ subport gnss-sdr-devel {
</span> This port is kept up with the GNSS-SDR GIT master 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-devel port, which represents GNU Radio GIT master branch. 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 [...]
name gnss-sdr-devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup gnss-sdr gnss-sdr c224817e9ce2bbac8f81a48168757d316cfd1694
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20180828
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 6dd660cfeace4f70ecf9c08995d8469bd7c1b77d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 644aa9acd223836aab2637fd787cba44ee35c5bb80257a8cab8edd780e4e97cc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3311359
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup gnss-sdr gnss-sdr 31c6b6bc1da77c9589a04d52a38d2d20edacf06e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20190208
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 733c3211b163825be36db80d89f9fb0db0051264 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d44b32fd2bbdc703097e2368281d77ad4e2c42ec7c76c6e7ef100b014a716e3e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3575803
</span>
conflicts gnss-sdr gnss-sdr-next
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,10 +53,6 @@ subport gnss-sdr-devel {
</span>
require_active_variants port:gnuradio-devel uhd
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # patch to fix building using Boost 1.67.0+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-for_boost_1.67.devel.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> }
subport gnss-sdr-next {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,31 +60,18 @@ 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 port, which represents GNU Radio GIT next branch. 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 acti [...]
name gnss-sdr-next
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup gnss-sdr gnss-sdr c74b9527cd67ee217cb7ccc73832776fa4ed261c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20181126
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 0b76d39a906cecceb96ebaa1d5017d04e66d225b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 8fe7a5118b8a1be26b3e23336e71f31299565c134876a0aa46b25dfd8a58b3b4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3566982
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup gnss-sdr gnss-sdr dc6876e1c98f82e5bdf9d5c11033d0a8dd09071a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20190401
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 b12df8770df43d3a870b79308a0255cce9e2c232 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 24363bdf71598fa22397d76787114942c7ac7e6a5ba1ca8be690c7603234bc1a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3675047
</span>
conflicts gnss-sdr gnss-sdr-devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:gnuradio-next port:volk-gnss-sdr-next
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:gnuradio-next port:volk-gnss-sdr-next port:lapack
</span>
require_active_variants port:gnuradio-next uhd
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # add matio as a dependency
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:matio
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DMATIO_INCLUDE_DIR=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DMATIO_LIBRARY=${prefix}/lib/libmatio.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # patch to allow specification of version info
</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> # specify version info
configure.args-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -109,7 +86,7 @@ subport gnss-sdr-next {
</span>
# override github PortGroup homepage setting
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://gnss-sdr.org
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://gnss-sdr.org
</span>
depends_build-append \
port:pkgconfig \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -119,12 +96,17 @@ depends_lib-append \
</span> port:boost \
port:armadillo \
port:google-glog \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:matio \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pugixml \
</span> path:lib/libuhd.dylib:uhd \
port:gnutls
depends_test-append \
port:cppunit
<span style='display:block; white-space:pre;background:#e0ffe0;'>+test.run yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.target run_tests
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # require specific variants
require_active_variants port:google-glog gflags
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -143,12 +125,6 @@ configure.args-append \
</span> -DENABLE_OWN_GLOG=OFF \
-DENABLE_GENERIC_ARCH=OFF
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# disable building unit tests, which errors out as of 2018-01-18.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# see also: https://trac.macports.org/ticket/55714
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_UNIT_TESTING=OFF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # specify dependency arguments
configure.args-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -163,6 +139,8 @@ configure.args-append \
</span> -DGNUTLS_OPENSSL_LIBRARY=${prefix}/lib/libgnutls-openssl.dylib \
-DMATIO_INCLUDE_DIR=${prefix}/include \
-DMATIO_LIBRARY=${prefix}/lib/libmatio.dylib \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPUGIXML_INCLUDE_DIR=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPUGIXML_LIBRARY=${prefix}/lib/libpugixml.dylib \
</span> -DUHD_INCLUDE_DIR=${prefix}/include \
-DUHD_LIBRARIES=${prefix}/lib/libuhd.dylib \
-DVOLK_GNSSSDR_INCLUDE_DIR=${prefix}/include \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -224,12 +202,13 @@ if {![variant_isset opencl]} {
</span>
variant osmosdr description "Install ${name} with support for OsmoSDR and other front-ends (RTL-based dongles, HackRF, bladeRF, etc.) as signal source." {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gr-osmosdr
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_OSMOSDR=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${subport} ne "gnss-sdr-next"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gr-osmosdr
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_OSMOSDR=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
if {![variant_isset osmosdr]} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gnss-sdr/files/patch-CMakeLists.txt.diff b/science/gnss-sdr/files/patch-CMakeLists.txt.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b4212d4..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gnss-sdr/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,44 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -96,20 +96,27 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ###############################
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(THIS_IS_A_RELEASE OFF) # only related to version name, no further implications.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(NOT ${THIS_IS_A_RELEASE})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # Get the current working branch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- execute_process(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- COMMAND git rev-parse --abbrev-ref HEAD
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- OUTPUT_VARIABLE GIT_BRANCH
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- OUTPUT_STRIP_TRAILING_WHITESPACE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # Get the latest abbreviated commit hash of the working branch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- execute_process(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- COMMAND git log -1 --format=%h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- OUTPUT_VARIABLE GIT_COMMIT_HASH
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- OUTPUT_STRIP_TRAILING_WHITESPACE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # was this info set in the CMake commandline?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(NOT GIT_BRANCH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # no: try to find it
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ execute_process(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ COMMAND git rev-parse --abbrev-ref HEAD
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ OUTPUT_VARIABLE GIT_BRANCH
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ OUTPUT_STRIP_TRAILING_WHITESPACE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ OUTPUT_QUIET ERROR_QUIET
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ endif(NOT GIT_BRANCH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # was this info set in the CMake commandline?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(NOT GIT_COMMIT_HASH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ execute_process(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ COMMAND git log -1 --format=%h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ OUTPUT_VARIABLE GIT_COMMIT_HASH
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ OUTPUT_STRIP_TRAILING_WHITESPACE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ OUTPUT_QUIET ERROR_QUIET
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ endif(NOT GIT_COMMIT_HASH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(VERSION_INFO_MAJOR_VERSION 0)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gnss-sdr/files/patch-for_boost_1.67.devel.diff b/science/gnss-sdr/files/patch-for_boost_1.67.devel.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 086caa8..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gnss-sdr/files/patch-for_boost_1.67.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,130 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/algorithms/PVT/libs/galileo_e1_ls_pvt.cc.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/algorithms/PVT/libs/galileo_e1_ls_pvt.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -184,7 +184,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Compute Gregorian time
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- utc = galileo_utc_model.GST_to_UTC_time(GST, Galileo_week_number);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // get time string Gregorian calendar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- boost::posix_time::time_duration t = boost::posix_time::seconds(utc);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ boost::posix_time::time_duration t = boost::posix_time::milliseconds(static_cast<long>(utc * 1000000));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // 22 August 1999 00:00 last Galileo start GST epoch (ICD sec 5.1.2)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- boost::posix_time::ptime p_time(boost::gregorian::date(1999, 8, 22), t);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- d_position_UTC_time = p_time;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/algorithms/PVT/libs/gps_l1_ca_ls_pvt.cc.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/algorithms/PVT/libs/gps_l1_ca_ls_pvt.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -190,7 +190,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Compute UTC time and print PVT solution
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- double secondsperweek = 604800.0; // number of seconds in one week (7*24*60*60)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- boost::posix_time::time_duration t = boost::posix_time::seconds(utc + secondsperweek * static_cast<double>(GPS_week));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ boost::posix_time::time_duration t = boost::posix_time::seconds(static_cast<long>(utc + secondsperweek * static_cast<double>(GPS_week)));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // 22 August 1999 last GPS time roll over
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- boost::posix_time::ptime p_time(boost::gregorian::date(1999, 8, 22), t);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- d_position_UTC_time = p_time;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/algorithms/PVT/libs/hybrid_ls_pvt.cc.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/algorithms/PVT/libs/hybrid_ls_pvt.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -317,7 +317,7 @@
</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;'>- // get time string Gregorian calendar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- boost::posix_time::time_duration t = boost::posix_time::seconds(utc);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ boost::posix_time::time_duration t = boost::posix_time::milliseconds(static_cast<long>(utc * 1000000));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // 22 August 1999 00:00 last Galileo start GST epoch (ICD sec 5.1.2)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- boost::posix_time::ptime p_time(boost::gregorian::date(1999, 8, 22), t);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- d_position_UTC_time = p_time;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/algorithms/PVT/libs/rinex_printer.cc.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/algorithms/PVT/libs/rinex_printer.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4856,7 +4856,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // if we are processing a file -> wait to leap second to resolve the ambiguity else take the week from the local system time
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- //: idea resolve the ambiguity with the leap second http://www.colorado.edu/geography/gcraft/notes/gps/gpseow.htm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const double utc_t = nav_msg.utc_time(nav_msg.d_TOW);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- boost::posix_time::time_duration t = boost::posix_time::millisec((utc_t + 604800 * static_cast<double>(nav_msg.i_GPS_week)) * 1000);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ boost::posix_time::time_duration t = boost::posix_time::milliseconds(static_cast<long>((utc_t + 604800 * static_cast<double>(nav_msg.i_GPS_week)) * 1000));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- boost::posix_time::ptime p_time(boost::gregorian::date(1999, 8, 22), t);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return p_time;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4869,7 +4869,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // (see Pag. 17 in http://igscb.jpl.nasa.gov/igscb/data/format/rinex300.pdf)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // --??? No time correction here, since it will be done in the RINEX processor
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const double gps_t = obs_time;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- boost::posix_time::time_duration t = boost::posix_time::millisec((gps_t + 604800 * static_cast<double>(eph.i_GPS_week % 1024)) * 1000);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ boost::posix_time::time_duration t = boost::posix_time::milliseconds(static_cast<long>((gps_t + 604800 * static_cast<double>(eph.i_GPS_week % 1024)) * 1000));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- boost::posix_time::ptime p_time(boost::gregorian::date(1999, 8, 22), t);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return p_time;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4882,7 +4882,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // (see Pag. 17 in http://igscb.jpl.nasa.gov/igscb/data/format/rinex300.pdf)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // --??? No time correction here, since it will be done in the RINEX processor
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const double gps_t = obs_time;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- boost::posix_time::time_duration t = boost::posix_time::millisec((gps_t + 604800 * static_cast<double>(eph.i_GPS_week % 1024)) * 1000);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ boost::posix_time::time_duration t = boost::posix_time::milliseconds(static_cast<long>((gps_t + 604800 * static_cast<double>(eph.i_GPS_week % 1024)) * 1000));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- boost::posix_time::ptime p_time(boost::gregorian::date(1999, 8, 22), t);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return p_time;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4894,7 +4894,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // (see Pag. 17 in http://igscb.jpl.nasa.gov/igscb/data/format/rinex301.pdf)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // --??? No time correction here, since it will be done in the RINEX processor
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- double galileo_t = obs_time;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- boost::posix_time::time_duration t = boost::posix_time::millisec((galileo_t + 604800 * static_cast<double>(eph.WN_5)) * 1000); //
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ boost::posix_time::time_duration t = boost::posix_time::milliseconds(static_cast<long>((galileo_t + 604800 * static_cast<double>(eph.WN_5)) * 1000));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- boost::posix_time::ptime p_time(boost::gregorian::date(1999, 8, 22), t);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return p_time;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/core/system_parameters/rtcm.cc.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/core/system_parameters/rtcm.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2563,7 +2563,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- boost::posix_time::ptime Rtcm::compute_GPS_time(const Gps_Ephemeris & eph, double obs_time) const
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const double gps_t = obs_time;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- boost::posix_time::time_duration t = boost::posix_time::millisec((gps_t + 604800 * static_cast<double>(eph.i_GPS_week % 1024)) * 1000);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ boost::posix_time::time_duration t = boost::posix_time::milliseconds(static_cast<long>((gps_t + 604800 * static_cast<double>(eph.i_GPS_week % 1024)) * 1000));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- boost::posix_time::ptime p_time(boost::gregorian::date(1999, 8, 22), t);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return p_time;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2572,7 +2572,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- boost::posix_time::ptime Rtcm::compute_GPS_time(const Gps_CNAV_Ephemeris & eph, double obs_time) const
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const double gps_t = obs_time;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- boost::posix_time::time_duration t = boost::posix_time::millisec((gps_t + 604800 * static_cast<double>(eph.i_GPS_week % 1024)) * 1000);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ boost::posix_time::time_duration t = boost::posix_time::milliseconds(static_cast<long>((gps_t + 604800 * static_cast<double>(eph.i_GPS_week % 1024)) * 1000));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- boost::posix_time::ptime p_time(boost::gregorian::date(1999, 8, 22), t);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return p_time;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2581,7 +2581,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- boost::posix_time::ptime Rtcm::compute_Galileo_time(const Galileo_Ephemeris & eph, double obs_time) const
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- double galileo_t = obs_time;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- boost::posix_time::time_duration t = boost::posix_time::millisec((galileo_t + 604800 * static_cast<double>(eph.WN_5)) * 1000);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ boost::posix_time::time_duration t = boost::posix_time::milliseconds(static_cast<long>((galileo_t + 604800 * static_cast<double>(eph.WN_5)) * 1000));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- boost::posix_time::ptime p_time(boost::gregorian::date(1999, 8, 22), t);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return p_time;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3031,7 +3031,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int Rtcm::set_DF051(const Gps_Ephemeris & gps_eph, double obs_time)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const double gps_t = obs_time;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- boost::posix_time::time_duration t = boost::posix_time::millisec((gps_t + 604800 * static_cast<double>(gps_eph.i_GPS_week % 1024)) * 1000);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ boost::posix_time::time_duration t = boost::posix_time::milliseconds(static_cast<long>((gps_t + 604800 * static_cast<double>(gps_eph.i_GPS_week % 1024)) * 1000));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- boost::posix_time::ptime p_time(boost::gregorian::date(1999, 8, 22), t);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- std::string now_ptime = to_iso_string(p_time);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- std::string today_ptime = now_ptime.substr(0, 8);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3045,7 +3045,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int Rtcm::set_DF052(const Gps_Ephemeris & gps_eph, double obs_time)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const double gps_t = obs_time;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- boost::posix_time::time_duration t = boost::posix_time::millisec((gps_t + 604800 * static_cast<double>(gps_eph.i_GPS_week % 1024)) * 1000);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ boost::posix_time::time_duration t = boost::posix_time::milliseconds(static_cast<long>((gps_t + 604800 * static_cast<double>(gps_eph.i_GPS_week % 1024)) * 1000));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- boost::posix_time::ptime p_time(boost::gregorian::date(1999, 8, 22), t);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- std::string now_ptime = to_iso_string(p_time);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- std::string hours = now_ptime.substr(9, 2);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/main/main.cc.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/main/main.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -118,8 +118,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- << " does not exist, attempting to create it."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- << std::endl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- boost::system::error_code ec;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- boost::filesystem::create_directory(p, ec);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(ec != 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(boost::filesystem::create_directory(p, ec))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- std::cout << "Could not create the " << FLAGS_log_dir << " folder. GNSS-SDR program ended." << std::endl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- google::ShutDownCommandLineFlags();
</span><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 0460a84..767162d 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;'>@@ -21,17 +21,13 @@ if {${subport} eq "volk-gnss-sdr"} {
</span> long_description ${description}: \
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.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup gnss-sdr gnss-sdr 0.0.9 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 695cab70f3fe597e53cc772bfb96096e6fe0d139 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 5110f66c8b8a63ee5db5569f0b1f8040f36e3541a3a249d08f3154bc05317184
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup gnss-sdr gnss-sdr 0.0.10 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 733c3211b163825be36db80d89f9fb0db0051264 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d44b32fd2bbdc703097e2368281d77ad4e2c42ec7c76c6e7ef100b014a716e3e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3575803
</span> github.tarball_from tags
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # github changed the way tarballs are generated
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # remove this at next update
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see also: https://trac.macports.org/ticket/54839
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dist_subdir ${name}/${version}_1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> conflicts volk-gnss-sdr-devel volk-gnss-sdr-next
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,11 +38,11 @@ subport volk-gnss-sdr-devel {
</span> This port is kept up with the VOLK-GNSS-SDR GIT master 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-devel and gnuradio-devel 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 [...]
name volk-gnss-sdr-devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup gnss-sdr gnss-sdr c224817e9ce2bbac8f81a48168757d316cfd1694
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20180828
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 6dd660cfeace4f70ecf9c08995d8469bd7c1b77d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 644aa9acd223836aab2637fd787cba44ee35c5bb80257a8cab8edd780e4e97cc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3311359
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup gnss-sdr gnss-sdr 31c6b6bc1da77c9589a04d52a38d2d20edacf06e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20190208
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 733c3211b163825be36db80d89f9fb0db0051264 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d44b32fd2bbdc703097e2368281d77ad4e2c42ec7c76c6e7ef100b014a716e3e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3575803
</span>
conflicts volk-gnss-sdr volk-gnss-sdr-next
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -57,11 +53,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 c74b9527cd67ee217cb7ccc73832776fa4ed261c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20181126
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 0b76d39a906cecceb96ebaa1d5017d04e66d225b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 8fe7a5118b8a1be26b3e23336e71f31299565c134876a0aa46b25dfd8a58b3b4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3566982
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup gnss-sdr gnss-sdr dc6876e1c98f82e5bdf9d5c11033d0a8dd09071a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20190401
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 b12df8770df43d3a870b79308a0255cce9e2c232 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 24363bdf71598fa22397d76787114942c7ac7e6a5ba1ca8be690c7603234bc1a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3675047
</span>
conflicts volk-gnss-sdr volk-gnss-sdr-devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -73,7 +69,7 @@ subport volk-gnss-sdr-next {
</span>
# override github PortGroup homepage setting
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://gnss-sdr.org
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://gnss-sdr.org
</span>
depends_build-append port:pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -110,3 +106,5 @@ configure.args-append \
</span>
configure.args-append \
-DCMAKE_MODULES_DIR=${prefix}/share/cmake
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.run yes
</span></pre><pre style='margin:0'>
</pre>