<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/181f98bed5df32dd5d4b1e9614610cd82f074042">https://github.com/macports/macports-ports/commit/181f98bed5df32dd5d4b1e9614610cd82f074042</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 181f98b volk-devel: update to 8dbffe93 (20180604).
</span>181f98b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 181f98bed5df32dd5d4b1e9614610cd82f074042
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Tue Jun 5 16:41:47 2018 -0400
<span style='display:block; white-space:pre;color:#404040;'> volk-devel: update to 8dbffe93 (20180604).
</span>---
science/volk/Portfile | 10 +++++-----
science/volk/files/patch-CMakeLists.txt.diff | 16 ++++++++--------
2 files changed, 13 insertions(+), 13 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 3b20ce6..96e1aa0 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;'>@@ -37,12 +37,12 @@ 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 297fefdd16e5a230f094e0f4ac2918f0586154be
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20180427
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup gnuradio volk 8dbffe93a07e184d54599f08ffbf48894bc35c07
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20180604
</span> checksums \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 5e9bc996dd18f9b0fcd7c1b67fa6f5247c8bf835 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 f7766f16ecb00d099a306472c8bc4cbe0d06a4f07894992fdf22350811ec5590 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 234547
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 3769a848cc014dbbc5f2f559e28b8b98cfa1343d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 7ebcf74bef2de539e99b2568a64f152fb54eb2a64aee33a2442bbda48023f92a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 235234
</span>
conflicts volk
long_description ${long_description} ${subport} \
<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 2c9015c..a2301f7 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;'>@@ -2,11 +2,10 @@ diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
</span> index 118828b..0fb0d75 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -443,6 +443,18 @@ else(${CMAKE_VERSION} VERSION_GREATER "2.8.9")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endforeach()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -474,6 +474,18 @@
</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;'>@@ -18,10 +17,11 @@ 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;'>-@@ -522,24 +534,10 @@ if(CMAKE_VERSION VERSION_GREATER "2.8.11")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(ORC_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -552,24 +564,10 @@
</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;'>-@@ -556,13 +554,6 @@ if(CMAKE_VERSION VERSION_GREATER "2.8.11")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -586,13 +584,6 @@
</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;'>-@@ -575,13 +566,6 @@ else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -605,13 +596,6 @@
</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;'>-@@ -605,6 +589,7 @@ else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -635,6 +619,7 @@
</span> endif(ENABLE_STATIC_LIBS)
endif(CMAKE_VERSION VERSION_GREATER "2.8.11")
</pre><pre style='margin:0'>
</pre>