<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/29cbd6ebfb2d2ce45c93529fea17a4e395f2a3fe">https://github.com/macports/macports-ports/commit/29cbd6ebfb2d2ce45c93529fea17a4e395f2a3fe</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 29cbd6e  volk-devel: update to a0e406e0 (20170912).
</span>29cbd6e is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 29cbd6ebfb2d2ce45c93529fea17a4e395f2a3fe
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Fri Sep 29 06:52:16 2017 -0400

<span style='display:block; white-space:pre;color:#404040;'>    volk-devel: update to a0e406e0 (20170912).
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    add patch to fix include_directories ordering so-as to pick up project headers before external headers. allows for in-place building while a prior version is already installed.
</span>---
 science/volk/Portfile                        | 14 +++--
 science/volk/files/patch-CMakeLists.txt.diff | 84 ++++++++++++++++++++++++++++
 2 files changed, 94 insertions(+), 4 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 c439094..2ed576e 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;'>@@ -35,16 +35,22 @@ 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 55c999db2214097fd1fab6ccdb865c0ae97ee9b4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    version         20170911
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    github.setup    gnuradio volk a0e406e042ed9cda27333efa2de0fcc10912ea07
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    version         20170912
</span>     checksums       \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        rmd160 ef4de17a5e073bf32b283760ebbb87d0a3713158 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        sha256 082138e822953568948caf9a94c3da060d4806884162e4d28768943aa2c9741f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        rmd160 28d7456c02da7dbbe0f0d1e62ced8a18078297f1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        sha256 dae0c2a79e07581773b004a3de2354ce0f37c6719e140e2757f21c77f90c187b
</span> 
     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:#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;'>+    patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..2c9015c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</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;'>@@ -0,0 +1,84 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 118828b..0fb0d75 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/lib/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/lib/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -443,6 +443,18 @@ else(${CMAKE_VERSION} VERSION_GREATER "2.8.9")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   endforeach()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif(${CMAKE_VERSION} VERSION_GREATER "2.8.9")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++########################################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# set initial include directories for finding headers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++########################################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++include_directories(volk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    ${PROJECT_BINARY_DIR}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    ${PROJECT_SOURCE_DIR}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    ${PROJECT_SOURCE_DIR}/kernels
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    ${CMAKE_CURRENT_BINARY_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    ${CMAKE_CURRENT_SOURCE_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ########################################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Handle orc support
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ########################################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -522,24 +534,10 @@ if(CMAKE_VERSION VERSION_GREATER "2.8.11")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     #Create a volk object library (requires cmake >= 2.8.8)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     add_library(volk_obj OBJECT ${volk_sources})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     # a better cmake-fu user may make this more repeatable
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    target_include_directories(volk_obj
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-        PUBLIC ${PROJECT_BINARY_DIR}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-        PUBLIC ${PROJECT_SOURCE_DIR}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-        PRIVATE ${PROJECT_SOURCE_DIR}/kernels
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-        PRIVATE ${CMAKE_CURRENT_BINARY_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-        PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     #Add dynamic library
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     add_library(volk SHARED $<TARGET_OBJECTS:volk_obj>)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     target_link_libraries(volk ${volk_libraries})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    target_include_directories(volk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-        PUBLIC ${PROJECT_BINARY_DIR}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-        PUBLIC ${PROJECT_SOURCE_DIR}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-        PRIVATE ${PROJECT_SOURCE_DIR}/kernels
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-        PRIVATE ${CMAKE_CURRENT_BINARY_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-        PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     #Configure target properties
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     set_target_properties(volk_obj PROPERTIES COMPILE_FLAGS "-fPIC")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -556,13 +554,6 @@ if(CMAKE_VERSION VERSION_GREATER "2.8.11")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     #Configure static library
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     if(ENABLE_STATIC_LIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         add_library(volk_static STATIC $<TARGET_OBJECTS:volk_obj>)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-        target_include_directories(volk_static
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            PUBLIC ${PROJECT_BINARY_DIR}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            PUBLIC ${PROJECT_SOURCE_DIR}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            PRIVATE ${PROJECT_SOURCE_DIR}/kernels
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            PRIVATE ${CMAKE_CURRENT_BINARY_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-        )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         set_target_properties(volk_static PROPERTIES OUTPUT_NAME volk)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -575,13 +566,6 @@ else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     #create the volk runtime library
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     add_library(volk SHARED ${volk_sources})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     target_link_libraries(volk ${volk_libraries})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    include_directories(volk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-        PUBLIC ${PROJECT_BINARY_DIR}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-        PUBLIC ${PROJECT_SOURCE_DIR}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-        PRIVATE ${PROJECT_SOURCE_DIR}/kernels
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-        PRIVATE ${CMAKE_CURRENT_BINARY_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-        PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     set_target_properties(volk PROPERTIES SOVERSION ${LIBVER})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     set_target_properties(volk PROPERTIES DEFINE_SYMBOL "volk_EXPORTS")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -605,6 +589,7 @@ else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     endif(ENABLE_STATIC_LIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif(CMAKE_VERSION VERSION_GREATER "2.8.11")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ########################################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Build the QA test application
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ########################################################################
</span></pre><pre style='margin:0'>

</pre>