<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[135593] trunk/dports/science/gr-ais</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/135593">135593</a></dd>
<dt>Author</dt> <dd>michaelld@macports.org</dd>
<dt>Date</dt> <dd>2015-04-27 10:40:32 -0700 (Mon, 27 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>gr-ais:
+ update to 56abd162 (20150414);
+ patch to fix to work with separate port:volk.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportssciencegraisPortfile">trunk/dports/science/gr-ais/Portfile</a></li>
<li><a href="#trunkdportssciencegraisfilespatchCMakeListstxtdiff">trunk/dports/science/gr-ais/files/patch-CMakeLists.txt.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportssciencegraisPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/gr-ais/Portfile (135592 => 135593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/gr-ais/Portfile 2015-04-27 16:55:07 UTC (rev 135592)
+++ trunk/dports/science/gr-ais/Portfile 2015-04-27 17:40:32 UTC (rev 135593)
</span><span class="lines">@@ -5,12 +5,15 @@
</span><span class="cx"> PortGroup cmake 1.0
</span><span class="cx"> PortGroup github 1.0
</span><span class="cx">
</span><del>-github.setup bistromath gr-ais 7fdfc4d24b7bd44456a1734ae4d934af56a17475
-version 20140919
-revision 1
-checksums rmd160 dd2b6b00c70e76182b79be816ec78e1f1cc5e54e \
- sha256 a47e58d7a457f2f2aafe934684a5f3ea0d8c25714a7f75aeadf2305eec67931a
</del><ins>+github.setup bistromath gr-ais 56abd162cf4add878dbfa3bd60215001d4ae83ea
+version 20150414
+checksums rmd160 7f32129d62958856aa4645681651167ec4d3ce01 \
+ sha256 cf8bfbf297e57b4c3f0fe987b5a7d244ccab240911c08f8abd0e8530e07810ff
</ins><span class="cx">
</span><ins>+# required volk
+
+depends_lib-append port:volk
+
</ins><span class="cx"> # allow gr-ais to work with both gnuradio and gnuradio-devel ...
</span><span class="cx">
</span><span class="cx"> depends_lib-append path:lib/libgnuradio-runtime.dylib:gnuradio
</span><span class="lines">@@ -48,7 +51,7 @@
</span><span class="cx">
</span><span class="cx"> cmake.out_of_source yes
</span><span class="cx">
</span><del>-# temporary patch to fix CMake stuff on OSX
</del><ins>+# temporary patch to fix CMake stuff
</ins><span class="cx">
</span><span class="cx"> patchfiles-append patch-CMakeLists.txt.diff
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportssciencegraisfilespatchCMakeListstxtdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/gr-ais/files/patch-CMakeLists.txt.diff (135592 => 135593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/gr-ais/files/patch-CMakeLists.txt.diff 2015-04-27 16:55:07 UTC (rev 135592)
+++ trunk/dports/science/gr-ais/files/patch-CMakeLists.txt.diff 2015-04-27 17:40:32 UTC (rev 135593)
</span><span class="lines">@@ -1,59 +1,97 @@
</span><del>---- CMakeLists.txt.orig 2015-01-02 11:26:38.000000000 -0500
-+++ CMakeLists.txt 2015-01-02 11:27:32.000000000 -0500
-@@ -32,7 +32,8 @@
- endif(NOT CMAKE_BUILD_TYPE)
- set(CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE} CACHE STRING "")
-
--list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/Modules)
-+#make sure our local CMake Modules path comes first
-+list(INSERT CMAKE_MODULE_PATH 0 ${CMAKE_SOURCE_DIR}/cmake/Modules)
-
</del><ins>+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -85,6 +85,7 @@ set(GRC_BLOCKS_DIR ${GR_PKG_DATA_DIR}/grc/blocks)
</ins><span class="cx"> ########################################################################
</span><del>- # Compiler specific setup
-@@ -91,13 +92,33 @@
- # caps such as FILTER or FFT) and change the version to the minimum
- # API compatible version required.
- set(GR_REQUIRED_COMPONENTS RUNTIME PMT)
--find_package(Gnuradio "3.7.6" REQUIRED)
-+find_package(Gnuradio "3.7.5.2" REQUIRED)
</del><ins>+ find_package(CppUnit)
+ find_package(Doxygen)
++find_package(Volk)
</ins><span class="cx">
</span><del>- if(NOT CPPUNIT_FOUND)
</del><ins>+ # Search for GNU Radio and its components and versions. Add any
+ # components required to the list of GR_REQUIRED_COMPONENTS (in all
+@@ -97,6 +98,30 @@ if(NOT CPPUNIT_FOUND)
</ins><span class="cx"> message(FATAL_ERROR "CppUnit required to compile gr-ais")
</span><span class="cx"> endif()
</span><span class="cx">
</span><del>- ########################################################################
</del><ins>++if(NOT VOLK_FOUND)
++ message(FATAL_ERROR "Volk required to compile gr-ais")
++endif()
++
++########################################################################
</ins><span class="cx"> +# On Apple only, set install name and use rpath correctly, if not already set
</span><span class="cx"> +########################################################################
</span><span class="cx"> +if(APPLE)
</span><del>-+ if(NOT CMAKE_INSTALL_NAME_DIR)
-+ set(CMAKE_INSTALL_NAME_DIR
-+ ${CMAKE_INSTALL_PREFIX}/${GR_LIBRARY_DIR} CACHE
-+ PATH "Library Install Name Destination Directory" FORCE)
-+ endif(NOT CMAKE_INSTALL_NAME_DIR)
-+ if(NOT CMAKE_INSTALL_RPATH)
-+ set(CMAKE_INSTALL_RPATH
-+ ${CMAKE_INSTALL_PREFIX}/${GR_LIBRARY_DIR} CACHE
-+ PATH "Library Install RPath" FORCE)
-+ endif(NOT CMAKE_INSTALL_RPATH)
-+ if(NOT CMAKE_BUILD_WITH_INSTALL_RPATH)
-+ set(CMAKE_BUILD_WITH_INSTALL_RPATH ON CACHE
-+ BOOL "Do Build Using Library Install RPath" FORCE)
-+ endif(NOT CMAKE_BUILD_WITH_INSTALL_RPATH)
</del><ins>++ if(NOT CMAKE_INSTALL_NAME_DIR)
++ set(CMAKE_INSTALL_NAME_DIR
++ ${CMAKE_INSTALL_PREFIX}/${GR_LIBRARY_DIR} CACHE
++ PATH "Library Install Name Destination Directory" FORCE)
++ endif(NOT CMAKE_INSTALL_NAME_DIR)
++ if(NOT CMAKE_INSTALL_RPATH)
++ set(CMAKE_INSTALL_RPATH
++ ${CMAKE_INSTALL_PREFIX}/${GR_LIBRARY_DIR} CACHE
++ PATH "Library Install RPath" FORCE)
++ endif(NOT CMAKE_INSTALL_RPATH)
++ if(NOT CMAKE_BUILD_WITH_INSTALL_RPATH)
++ set(CMAKE_BUILD_WITH_INSTALL_RPATH ON CACHE
++ BOOL "Do Build Using Library Install RPath" FORCE)
++ endif(NOT CMAKE_BUILD_WITH_INSTALL_RPATH)
</ins><span class="cx"> +endif(APPLE)
</span><span class="cx"> +
</span><del>-+########################################################################
</del><ins>+ ########################################################################
</ins><span class="cx"> # Setup doxygen option
</span><span class="cx"> ########################################################################
</span><del>- if(DOXYGEN_FOUND)
-@@ -155,6 +176,10 @@
</del><ins>+@@ -117,12 +142,14 @@ include_directories(
+ ${Boost_INCLUDE_DIRS}
+ ${CPPUNIT_INCLUDE_DIRS}
+ ${GNURADIO_ALL_INCLUDE_DIRS}
++ ${VOLK_INCLUDE_DIRS}
+ )
+
+ link_directories(
+ ${Boost_LIBRARY_DIRS}
+ ${CPPUNIT_LIBRARY_DIRS}
+ ${GNURADIO_RUNTIME_LIBRARY_DIRS}
++ ${VOLK_LIBRARY_DIRS}
+ )
+
+ # Set component parameters
+@@ -155,6 +182,10 @@ add_subdirectory(docs)
</ins><span class="cx"> ########################################################################
</span><span class="cx"> # Install cmake search helper for this library
</span><span class="cx"> ########################################################################
</span><span class="cx"> +if(NOT CMAKE_MODULES_DIR)
</span><del>-+ set(CMAKE_MODULES_DIR lib${LIB_SUFFIX}/cmake)
</del><ins>++ set(CMAKE_MODULES_DIR lib${LIB_SUFFIX}/cmake)
</ins><span class="cx"> +endif(NOT CMAKE_MODULES_DIR)
</span><del>-+
</del><ins>++
</ins><span class="cx"> install(FILES cmake/Modules/aisConfig.cmake
</span><span class="cx"> - DESTINATION lib/cmake/ais
</span><span class="cx"> + DESTINATION ${CMAKE_MODULES_DIR}/ais
</span><span class="cx"> )
</span><ins>+--- lib/CMakeLists.txt.orig
++++ lib/CMakeLists.txt
+@@ -22,8 +22,6 @@
+ ########################################################################
+ include(GrPlatform) #define LIB_SUFFIX
+
+-include_directories(${Boost_INCLUDE_DIR})
+-link_directories(${Boost_LIBRARY_DIRS})
+ list(APPEND ais_sources
+ freqest_impl.cc
+ invert_impl.cc
+@@ -40,15 +38,10 @@ if(NOT ais_sources)
+ endif(NOT ais_sources)
+
+ add_library(gnuradio-ais SHARED ${ais_sources})
+-target_link_libraries(gnuradio-ais ${Boost_LIBRARIES} ${GNURADIO_ALL_LIBRARIES})
++target_link_libraries(gnuradio-ais ${Boost_LIBRARIES}
++ ${GNURADIO_ALL_LIBRARIES} ${VOLK_LIBRARIES})
+ set_target_properties(gnuradio-ais PROPERTIES DEFINE_SYMBOL "gnuradio_ais_EXPORTS")
+
+-if(APPLE)
+- set_target_properties(gnuradio-ais PROPERTIES
+- INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib"
+- )
+-endif(APPLE)
+-
+ ########################################################################
+ # Install built library files
+ ########################################################################
</ins></span></pre>
</div>
</div>
</body>
</html>