<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/4d2c8d56943e141befa3d1d2dc29412356455c2d">https://github.com/macports/macports-ports/commit/4d2c8d56943e141befa3d1d2dc29412356455c2d</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 4d2c8d56943 [volk-]gnss-sdr[-devel]: Update to v0.0.15
</span>4d2c8d56943 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 4d2c8d56943e141befa3d1d2dc29412356455c2d
</span>Author: Carles Fernandez <carles.fernandez@gmail.com>
AuthorDate: Tue Aug 24 14:18:20 2021 +0200
<span style='display:block; white-space:pre;color:#404040;'> [volk-]gnss-sdr[-devel]: Update to v0.0.15
</span>---
science/gnss-sdr/Portfile | 26 +++++++----------
science/gnss-sdr/files/patch-fix-building.diff | 13 ---------
science/volk-gnss-sdr/Portfile | 40 ++++++++++++--------------
3 files changed, 29 insertions(+), 50 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 4a9ac6a14e6..ca9c8c2613a 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;'>@@ -25,20 +25,16 @@ 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.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup gnss-sdr gnss-sdr 0.0.14 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 71e9bbb7e125396be06d97b26f333e9e2bb4a9be \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 48ba64073a995aa6f835c7a0cb775a741db9475359b036ca4245a65a6c1135fd \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 4269976
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup gnss-sdr gnss-sdr 0.0.15 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 dd47b983c26be07aa712b948bfbc504e72d7634a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 628df32a4376e2307637ea21e9bdd8215beec70a597c85946bda239052ec4f36 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 4357206
</span>
conflicts gnss-sdr-devel
depends_lib-append port:volk-gnss-sdr
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # temporary patch to fix building crashes with the message:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # "read jobs pipe: Resource temporarily unavailable. Stop."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-fix-building.diff
</span> }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,12 +42,12 @@ subport gnss-sdr-devel {
</span> long_description ${description}: \
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.
name gnss-sdr-devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup gnss-sdr gnss-sdr 3c74930c7d253c70b9ab52e6a76ab8f6a155810e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20210531-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 8449855911e5fd114a8b4141fd8a9741d0f5dc0f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 9d81599ed7cbcc5b5658040408353133b5791bf15b310031524a5e8b4fa81571 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 4349096
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup gnss-sdr gnss-sdr 0fc18f13f98c72e4e4808f044490253b71bd9e0d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20210824-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 fc4a068fe3f0ba3aae3975dd124ed31702ca9300 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 b0b18b208c320c6f7e9029d1f260107f64217832f1174455cf86d62ff55f0426 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 4359420
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span>
conflicts gnss-sdr
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gnss-sdr/files/patch-fix-building.diff b/science/gnss-sdr/files/patch-fix-building.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index dd8efa5bc68..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gnss-sdr/files/patch-fix-building.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/tests/CMakeLists.txt.orig 2021-05-31 10:10:26.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/tests/CMakeLists.txt 2021-05-31 10:11:28.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -30,6 +30,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "--build" "${CMAKE_BINARY_DIR}/gtest-${GNSSSDR_GTEST_LOCAL_VERSION}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "--config" $<$<CONFIG:Debug>:Debug>$<$<CONFIG:Release>:Release>$<$<CONFIG:RelWithDebInfo>:RelWithDebInfo>$<$<CONFIG:MinSizeRel>:MinSizeRel>$<$<CONFIG:NoOptWithASM>:Debug>$<$<CONFIG:Coverage>:Debug>$<$<CONFIG:O2WithASM>:RelWithDebInfo>$<$<CONFIG:O3WithASM>:RelWithDebInfo>$<$<CONFIG:ASAN>:Debug>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(CMAKE_VERSION VERSION_GREATER 3.12)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # Parallel building of gtest causes problems in some environments (e.g. Macports buildings)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(GTEST_BUILD_COMMAND ${GTEST_BUILD_COMMAND} "--parallel 1")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(CMAKE_GENERATOR STREQUAL Xcode)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(GTEST_BUILD_COMMAND "xcodebuild" "-configuration" $<$<CONFIG:Debug>:Debug>$<$<CONFIG:Release>:Release>$<$<CONFIG:RelWithDebInfo>:RelWithDebInfo>$<$<CONFIG:MinSizeRel>:MinSizeRel> "-target" "gtest_main")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</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 49695e61ea3..915506c839e 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;'>@@ -23,11 +23,11 @@ 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.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup gnss-sdr gnss-sdr 0.0.14 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 71e9bbb7e125396be06d97b26f333e9e2bb4a9be \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 48ba64073a995aa6f835c7a0cb775a741db9475359b036ca4245a65a6c1135fd \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 4269976
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup gnss-sdr gnss-sdr 0.0.15 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 dd47b983c26be07aa712b948bfbc504e72d7634a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 628df32a4376e2307637ea21e9bdd8215beec70a597c85946bda239052ec4f36 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 4357206
</span>
conflicts volk-gnss-sdr-devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,15 +38,21 @@ subport volk-gnss-sdr-devel {
</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.
name volk-gnss-sdr-devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup gnss-sdr gnss-sdr 3c74930c7d253c70b9ab52e6a76ab8f6a155810e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20210531-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 8449855911e5fd114a8b4141fd8a9741d0f5dc0f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 9d81599ed7cbcc5b5658040408353133b5791bf15b310031524a5e8b4fa81571 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 4349096
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup gnss-sdr gnss-sdr 0fc18f13f98c72e4e4808f044490253b71bd9e0d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20210824-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 fc4a068fe3f0ba3aae3975dd124ed31702ca9300 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 b0b18b208c320c6f7e9029d1f260107f64217832f1174455cf86d62ff55f0426 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 4359420
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span>
conflicts volk-gnss-sdr
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # specify version info
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DGIT_BRANCH="next-MacPorts" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DGIT_COMMIT_HASH="${version}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # overload the github livecheck branch
github.livecheck.branch next
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,7 +70,7 @@ depends_build-append port:pkgconfig
</span>
depends_lib-append \
path:lib/libvolk.dylib:volk \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:orc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:orc
</span>
# specify the Python dependencies; these are checked for at configure,
# then used for building, but not at runtime.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -135,13 +141,3 @@ configure.args-append \
</span> -DCMAKE_MODULES_DIR=${prefix}/share/cmake
test.run yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# temporary fix to remove same-named files from 'volk' install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${subport} eq "volk-gnss-sdr"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file delete ${destroot}${prefix}/bin/list_cpu_features
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file delete ${destroot}${prefix}/lib/libcpu_features.a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file delete -force ${destroot}${prefix}/include/cpu_features
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file delete -force ${destroot}${prefix}/lib/cmake/CpuFeatures
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span></pre><pre style='margin:0'>
</pre>