<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/b371f540d84e69dc253c8905fb5d088c30afb863">https://github.com/macports/macports-ports/commit/b371f540d84e69dc253c8905fb5d088c30afb863</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 b371f54 volk-devel: update to dd5e293c (20190107)
</span>b371f54 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b371f540d84e69dc253c8905fb5d088c30afb863
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Fri Jan 11 09:28:47 2019 -0500
<span style='display:block; white-space:pre;color:#404040;'> volk-devel: update to dd5e293c (20190107)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fix patches for upstream changes.
</span>---
science/volk/Portfile | 29 ++++++++++++++--------------
science/volk/files/patch-CMakeLists.txt.diff | 18 ++++++++---------
2 files changed, 24 insertions(+), 23 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 d153dfb..404a206 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;'>@@ -33,15 +33,24 @@ if {${name} eq ${subport}} {
</span> provides the release version, which is typically updated every month or so.
conflicts volk-devel
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # fix naming of *Clang compiler to just "Clang" for internal use
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-fix-clang.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # fix include_directories ordering so-as to pick up project
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # headers before external headers. allows for in-place building
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # while a prior version is already installed.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> }
subport volk-devel {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup gnuradio volk 59611a2844f748af08f7fbceab3fe4b1c1b25eee
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20181017
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 9391c8dae8cd4efa11c18a3c1009f1ca386b9729 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 897a624c36c4437aa57926cb9282056a871610c129b40d31d2856bce2134acb7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 252426
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup gnuradio volk dd5e293c85975d4db6718aef685b1a15de88a74f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20190107
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 7603df81fd3ccb257d4a13a1403027d6450251eb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d71ca70d171935f0b1da5b23109102ed061828fddd932f45a7a0ef1918d84d45 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 252541
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span>
conflicts volk
long_description ${long_description} ${subport} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,17 +58,9 @@ provides the Volk GIT maint or master branch, depending on which is more advance
</span>
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# fix include_directories ordering so-as to pick up project
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# headers before external headers. allows for in-place building
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# while a prior version is already installed.
</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;'>-patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# fix naming of *Clang compiler to just "Clang" for internal use
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-fix-clang.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # fix C++11 for internal use only
patchfiles-append patch-fix-cxx11.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patch.pre_args -p1
</span>
# override githib PortGroup homepage setting
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/volk/files/patch-CMakeLists.txt.diff b/science/volk/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index a2301f7..2cfaca4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/volk/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/volk/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,12 @@
</span> diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 118828b..0fb0d75 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 2438a40..9bfd3c5 100644
</span> --- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -474,6 +474,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -448,6 +448,18 @@ else(${CMAKE_VERSION} VERSION_GREATER "2.8.9")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endforeach()
</span> endif(${CMAKE_VERSION} VERSION_GREATER "2.8.9")
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ########################################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++########################################################################
</span> +# set initial include directories for finding headers
+########################################################################
+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,11 +18,10 @@ index 118828b..0fb0d75 100644
</span> + ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+########################################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ########################################################################
</span> # Handle orc support
########################################################################
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if(ORC_FOUND)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -552,24 +564,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -527,24 +539,10 @@ if(CMAKE_VERSION VERSION_GREATER "2.8.11")
</span> #Create a volk object library (requires cmake >= 2.8.8)
add_library(volk_obj OBJECT ${volk_sources})
# a better cmake-fu user may make this more repeatable
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,7 +46,7 @@ index 118828b..0fb0d75 100644
</span>
#Configure target properties
set_target_properties(volk_obj PROPERTIES COMPILE_FLAGS "-fPIC")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -586,13 +584,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -561,13 +559,6 @@ if(CMAKE_VERSION VERSION_GREATER "2.8.11")
</span> #Configure static library
if(ENABLE_STATIC_LIBS)
add_library(volk_static STATIC $<TARGET_OBJECTS:volk_obj>)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,7 +60,7 @@ index 118828b..0fb0d75 100644
</span>
set_target_properties(volk_static PROPERTIES OUTPUT_NAME volk)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -605,13 +596,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -580,13 +571,6 @@ else()
</span> #create the volk runtime library
add_library(volk SHARED ${volk_sources})
target_link_libraries(volk ${volk_libraries})
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -74,7 +74,7 @@ index 118828b..0fb0d75 100644
</span> set_target_properties(volk PROPERTIES SOVERSION ${LIBVER})
set_target_properties(volk PROPERTIES DEFINE_SYMBOL "volk_EXPORTS")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -635,6 +619,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -610,6 +594,7 @@ else()
</span> endif(ENABLE_STATIC_LIBS)
endif(CMAKE_VERSION VERSION_GREATER "2.8.11")
</pre><pre style='margin:0'>
</pre>