<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/5aa17513413aea68d522292d575c574acd59fad2">https://github.com/macports/macports-ports/commit/5aa17513413aea68d522292d575c574acd59fad2</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 5aa1751 volk-devel: update to 20190527-10c0e569
</span>5aa1751 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 5aa17513413aea68d522292d575c574acd59fad2
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Tue Jun 4 13:42:45 2019 -0400
<span style='display:block; white-space:pre;color:#404040;'> volk-devel: update to 20190527-10c0e569
</span>---
science/volk/Portfile | 15 +++------
...ch-cmake_Modules_VolkConfig.cmake.in.devel.diff | 37 ----------------------
2 files changed, 5 insertions(+), 47 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/volk/Portfile b/science/volk/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b57a43b..15c53bb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/volk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/volk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,22 +45,17 @@ provides the release version, which is typically updated every month or so.
</span>
subport volk-devel {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup gnuradio volk 3880e37cdc57d6f249e00b74ab7f8e0af8ffc5c7
</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;'>- checksums rmd160 8c16e7e99c91fbbe20706c72e54557ce249a548a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 9ae308a0d248cedb1d2d60ab32df1010eafb5da2a7864ba666f59220f866924d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 253766
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup gnuradio volk 10c0e5696433aae658d1fecc767267e5b9ae5e26
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20190527-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 b5302545f9e4fd820ad5a52f2326037531793b87 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 37ea376c0e6dd717d8e3401ca3037c7af0ef6eb72d0fe8d6b8fe30d2f74bffaf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 254181
</span> revision 0
conflicts volk
long_description ${long_description} ${subport} \
provides the Volk GIT maint or master branch, depending on which is more advanced, and is typically updated every few days to week.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # temporary patch to fix the find_package script to set FOUND_VOLK
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # as well as provide old-style settings for projects that have yet
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # to be updated to new-style CMake targets.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-cmake_Modules_VolkConfig.cmake.in.devel.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # fix C++11 for internal use only
patchfiles-append patch-fix-cxx11.devel.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/volk/files/patch-cmake_Modules_VolkConfig.cmake.in.devel.diff b/science/volk/files/patch-cmake_Modules_VolkConfig.cmake.in.devel.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index d66a590..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/volk/files/patch-cmake_Modules_VolkConfig.cmake.in.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,37 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/cmake/Modules/VolkConfig.cmake.in b/cmake/Modules/VolkConfig.cmake.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 29d3d13..d065464 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/cmake/Modules/VolkConfig.cmake.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/cmake/Modules/VolkConfig.cmake.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3,3 +3,32 @@ get_filename_component(VOLK_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(NOT TARGET Volk::volk)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include("${VOLK_CMAKE_DIR}/VolkTargets.cmake")
</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 VOLK_FOUND to be set globally, for whether a compatible Volk was
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# found -- could be a correct enough version or any version depending
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# on how find_package was called.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if(NOT TARGET Volk::volk)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(VOLK_FOUND FALSE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+else()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(VOLK_FOUND TRUE)
</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;'>-+# cache whether a compatible Volk was found for
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# use anywhere in the calling project
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+set(VOLK_FOUND ${VOLK_FOUND} CACHE BOOL "Whether a compatible Volk was found" FORCE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if(VOLK_FOUND)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # use the new target library, regardless of whether new or old style
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # we still need to set a variable with the library name so that there
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # is a variable to reference in the using-project's cmake scripts!
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(VOLK_LIBRARIES Volk::volk CACHE STRING "Volk Library" FORCE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # INTERFACE_INCLUDE_DIRECTORIES should always be set
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ get_target_property(VOLK_INCLUDE_DIRS Volk::volk INTERFACE_INCLUDE_DIRECTORIES)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(VOLK_INCLUDE_DIRS ${VOLK_INCLUDE_DIRS} CACHE STRING "Volk Include Directories" FORCE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # for backward compatibility with old-CMake non-target project finding
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ include(FindPackageHandleStandardArgs)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ find_package_handle_standard_args(VOLK DEFAULT_MSG VOLK_LIBRARIES VOLK_INCLUDE_DIRS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ mark_as_advanced(VOLK_LIBRARIES VOLK_INCLUDE_DIRS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+endif(VOLK_FOUND)
</span></pre><pre style='margin:0'>
</pre>