[135593] trunk/dports/science/gr-ais
michaelld at macports.org
michaelld at macports.org
Mon Apr 27 10:40:32 PDT 2015
Revision: 135593
https://trac.macports.org/changeset/135593
Author: michaelld at macports.org
Date: 2015-04-27 10:40:32 -0700 (Mon, 27 Apr 2015)
Log Message:
-----------
gr-ais:
+ update to 56abd162 (20150414);
+ patch to fix to work with separate port:volk.
Modified Paths:
--------------
trunk/dports/science/gr-ais/Portfile
trunk/dports/science/gr-ais/files/patch-CMakeLists.txt.diff
Modified: trunk/dports/science/gr-ais/Portfile
===================================================================
--- 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)
@@ -5,12 +5,15 @@
PortGroup cmake 1.0
PortGroup github 1.0
-github.setup bistromath gr-ais 7fdfc4d24b7bd44456a1734ae4d934af56a17475
-version 20140919
-revision 1
-checksums rmd160 dd2b6b00c70e76182b79be816ec78e1f1cc5e54e \
- sha256 a47e58d7a457f2f2aafe934684a5f3ea0d8c25714a7f75aeadf2305eec67931a
+github.setup bistromath gr-ais 56abd162cf4add878dbfa3bd60215001d4ae83ea
+version 20150414
+checksums rmd160 7f32129d62958856aa4645681651167ec4d3ce01 \
+ sha256 cf8bfbf297e57b4c3f0fe987b5a7d244ccab240911c08f8abd0e8530e07810ff
+# required volk
+
+depends_lib-append port:volk
+
# allow gr-ais to work with both gnuradio and gnuradio-devel ...
depends_lib-append path:lib/libgnuradio-runtime.dylib:gnuradio
@@ -48,7 +51,7 @@
cmake.out_of_source yes
-# temporary patch to fix CMake stuff on OSX
+# temporary patch to fix CMake stuff
patchfiles-append patch-CMakeLists.txt.diff
Modified: trunk/dports/science/gr-ais/files/patch-CMakeLists.txt.diff
===================================================================
--- 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)
@@ -1,59 +1,97 @@
---- 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)
-
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -85,6 +85,7 @@ set(GRC_BLOCKS_DIR ${GR_PKG_DATA_DIR}/grc/blocks)
########################################################################
- # 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)
+ find_package(CppUnit)
+ find_package(Doxygen)
++find_package(Volk)
- if(NOT CPPUNIT_FOUND)
+ # 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)
message(FATAL_ERROR "CppUnit required to compile gr-ais")
endif()
- ########################################################################
++if(NOT VOLK_FOUND)
++ message(FATAL_ERROR "Volk required to compile gr-ais")
++endif()
++
++########################################################################
+# On Apple only, set install name and use rpath correctly, if not already set
+########################################################################
+if(APPLE)
-+ 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)
++ 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)
+endif(APPLE)
+
-+########################################################################
+ ########################################################################
# Setup doxygen option
########################################################################
- if(DOXYGEN_FOUND)
-@@ -155,6 +176,10 @@
+@@ -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)
########################################################################
# Install cmake search helper for this library
########################################################################
+if(NOT CMAKE_MODULES_DIR)
-+ set(CMAKE_MODULES_DIR lib${LIB_SUFFIX}/cmake)
++ set(CMAKE_MODULES_DIR lib${LIB_SUFFIX}/cmake)
+endif(NOT CMAKE_MODULES_DIR)
-+
++
install(FILES cmake/Modules/aisConfig.cmake
- DESTINATION lib/cmake/ais
+ DESTINATION ${CMAKE_MODULES_DIR}/ais
)
+--- 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
+ ########################################################################
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150427/b74597f8/attachment.html>
More information about the macports-changes
mailing list