[142470] trunk/dports/science/volk-gnss-sdr
michaelld at macports.org
michaelld at macports.org
Sat Dec 12 05:53:40 PST 2015
Revision: 142470
https://trac.macports.org/changeset/142470
Author: michaelld at macports.org
Date: 2015-11-12 09:23:31 -0800 (Thu, 12 Nov 2015)
Log Message:
-----------
volk-gnss-sdr*:
+ update devel to 8838e906 and next to 8abe0486, both 20151103;
+ add temporary patches for all subports to fix name of cmake config file;
+ add configure.args to specify where to install cmake files;
+ rename release patchfile for clarity;
+ rev-bump release for changes.
Modified Paths:
--------------
trunk/dports/science/volk-gnss-sdr/Portfile
Added Paths:
-----------
trunk/dports/science/volk-gnss-sdr/files/patch-Volk_GnssSdrConfig.cmake.devel.diff
trunk/dports/science/volk-gnss-sdr/files/patch-Volk_GnssSdrConfig.cmake.next.diff
trunk/dports/science/volk-gnss-sdr/files/patch-Volk_GnssSdrConfig.cmake.release.diff
trunk/dports/science/volk-gnss-sdr/files/patch-volk-include.release.diff
Removed Paths:
-------------
trunk/dports/science/volk-gnss-sdr/files/patch-volk.diff
Modified: trunk/dports/science/volk-gnss-sdr/Portfile
===================================================================
--- trunk/dports/science/volk-gnss-sdr/Portfile 2015-11-12 16:41:55 UTC (rev 142469)
+++ trunk/dports/science/volk-gnss-sdr/Portfile 2015-11-12 17:23:31 UTC (rev 142470)
@@ -22,7 +22,7 @@
This port is kept up with the VOLK-GNSS-SDR release, which is typically updated every few months. This version compiles against the gnss-sdr and gnuradio ports.
github.setup gnss-sdr gnss-sdr 0.0.6 v
- revision 1
+ revision 2
checksums rmd160 3a578f4795f6230d3f627dbe6f80f77c7dac206e \
sha256 ed81a5dff8d91b0b1d561ab8a240818da447c8358b95ab42d6a17b479e873c3e
github.tarball_from tags
@@ -31,8 +31,12 @@
# temporary patch to fix Volk #define in compatibility
- patchfiles-append patch-volk.diff
+ patchfiles-append patch-volk-include.release.diff
+ # temporary patch to fix name of Volk-Gnss-Sdr cmake file
+
+ patchfiles-append patch-Volk_GnssSdrConfig.cmake.release.diff
+
}
subport volk-gnss-sdr-devel {
@@ -41,14 +45,17 @@
This port is kept up with the VOLK-GNSS-SDR GIT master branch, which is typically updated daily to weekly. This version of VOLK-GNSS-SDR generally contains fixes and new features that will be incorporated in an upcoming release, and compiles against the gnss-sdr-devel and gnuradio-devel ports. This port may or not compile or function correctly, as it represents a work in progress. If it does not work, check back in a few days. Or try deactivating the currently active gnss-sdr and gnuradio ports, cleaning any current builds, and trying again.
name volk-gnss-sdr-devel
- github.setup gnss-sdr gnss-sdr df6bd17bd844cddf46ce3f7e2a86fcde4a5eb24b
- version 20151025
- revision 1
- checksums rmd160 022cdccaf466d7c5cd43e4fd0ba201400eda9d0e \
- sha256 0808ecf6e17bf8e2b52f19bfd0c472f18c5a8718d5a665574c052c0a06452789
+ github.setup gnss-sdr gnss-sdr 8838e9063e7479c1c6339e0d012724d269e8d000
+ version 20151103
+ checksums rmd160 fc6e6a176c97dc1a0a3072e28accb37b0d301999 \
+ sha256 42337ac6a79f0bee33fbc8f5eb4ab586346050ae9873046a4b6e415bce0eb20e
conflicts volk-gnss-sdr volk-gnss-sdr-next
+ # temporary patch to fix name of Volk-Gnss-Sdr cmake file
+
+ patchfiles-append patch-Volk_GnssSdrConfig.cmake.devel.diff
+
}
subport volk-gnss-sdr-next {
@@ -56,14 +63,17 @@
This port is kept up with the VOLK-GNSS-SDR GIT next branch, which is typically updated daily to weekly. This version of VOLK-GNSS-SDR generally contains fixes and new features that will be incorporated in an upcoming release, and compiles against the gnss-sdr-next and gnuradio-next ports. This port may or not compile or function correctly, as it represents a work in progress. If it does not work, check back in a few days. Or try deactivating the currently active gnss-sdr and gnuradio ports, cleaning any current builds, and trying again.
name volk-gnss-sdr-next
- github.setup gnss-sdr gnss-sdr db4d55db6227cb220499ef1431f79cfbbf48b469
- version 20151101
- revision 1
- checksums rmd160 a362905eab0ce835ae9acaeabf5d5f46e72289a9 \
- sha256 bc3be18d87cc2de812ba4ee3f00e9c27052e99fe2b2e3905236ce236522448da
+ github.setup gnss-sdr gnss-sdr 8abe0486e9ef43e3082b66932a0b7e5018582027
+ version 20151103
+ checksums rmd160 2769b23825b180c095493702990dbf77ecacf97b \
+ sha256 f353f9a9e6061e5798217db832dc1f70b360597be1e7e8e3f7f9470264b278c9
conflicts volk-gnss-sdr volk-gnss-sdr-devel
+ # temporary patch to fix name of Volk-Gnss-Sdr cmake file
+
+ patchfiles-append patch-Volk_GnssSdrConfig.cmake.next.diff
+
}
# override githib PortGroup homepage setting
@@ -98,3 +108,8 @@
configure.args-append \
-DPYTHON_EXECUTABLE=${prefix}/Library/Frameworks/Python.framework/Versions/2.7/bin/python2.7
+
+# specify where to install cmake files
+
+configure.args-append \
+ -DCMAKE_MODULES_DIR=${prefix}/share/cmake
Added: trunk/dports/science/volk-gnss-sdr/files/patch-Volk_GnssSdrConfig.cmake.devel.diff
===================================================================
--- trunk/dports/science/volk-gnss-sdr/files/patch-Volk_GnssSdrConfig.cmake.devel.diff (rev 0)
+++ trunk/dports/science/volk-gnss-sdr/files/patch-Volk_GnssSdrConfig.cmake.devel.diff 2015-11-12 17:23:31 UTC (rev 142470)
@@ -0,0 +1,69 @@
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -147,7 +147,7 @@ if(NOT CMAKE_MODULES_DIR)
+ endif(NOT CMAKE_MODULES_DIR)
+
+ install(
+- FILES ${CMAKE_CURRENT_SOURCE_DIR}/cmake/VolkConfig.cmake
++ FILES ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Volk_GnssSdrConfig.cmake
+ DESTINATION ${CMAKE_MODULES_DIR}/volk_gnsssdr
+ COMPONENT "volk_gnsssdr_devel"
+ )
+--- cmake/VolkConfig.cmake
++++ /dev/null
+@@ -1,26 +0,0 @@
+-INCLUDE(FindPkgConfig)
+-PKG_CHECK_MODULES(PC_VOLK volk_gnsssdr)
+-
+-FIND_PATH(
+- VOLK_INCLUDE_DIRS
+- NAMES volk_gnsssdr/volk_gnsssdr.h
+- HINTS $ENV{VOLK_DIR}/include
+- ${PC_VOLK_INCLUDEDIR}
+- PATHS /usr/local/include
+- /usr/include
+-)
+-
+-FIND_LIBRARY(
+- VOLK_LIBRARIES
+- NAMES volk_gnsssdr
+- HINTS $ENV{VOLK_DIR}/lib
+- ${PC_VOLK_LIBDIR}
+- PATHS /usr/local/lib
+- /usr/local/lib64
+- /usr/lib
+- /usr/lib64
+-)
+-
+-INCLUDE(FindPackageHandleStandardArgs)
+-FIND_PACKAGE_HANDLE_STANDARD_ARGS(VOLK DEFAULT_MSG VOLK_LIBRARIES VOLK_INCLUDE_DIRS)
+-MARK_AS_ADVANCED(VOLK_LIBRARIES VOLK_INCLUDE_DIRS)
+--- /dev/null
++++ cmake/Volk_GnssSdrConfig.cmake
+@@ -0,0 +1,26 @@
++INCLUDE(FindPkgConfig)
++PKG_CHECK_MODULES(PC_VOLK volk_gnsssdr)
++
++FIND_PATH(
++ VOLK_INCLUDE_DIRS
++ NAMES volk_gnsssdr/volk_gnsssdr.h
++ HINTS $ENV{VOLK_DIR}/include
++ ${PC_VOLK_INCLUDEDIR}
++ PATHS /usr/local/include
++ /usr/include
++)
++
++FIND_LIBRARY(
++ VOLK_LIBRARIES
++ NAMES volk_gnsssdr
++ HINTS $ENV{VOLK_DIR}/lib
++ ${PC_VOLK_LIBDIR}
++ PATHS /usr/local/lib
++ /usr/local/lib64
++ /usr/lib
++ /usr/lib64
++)
++
++INCLUDE(FindPackageHandleStandardArgs)
++FIND_PACKAGE_HANDLE_STANDARD_ARGS(VOLK DEFAULT_MSG VOLK_LIBRARIES VOLK_INCLUDE_DIRS)
++MARK_AS_ADVANCED(VOLK_LIBRARIES VOLK_INCLUDE_DIRS)
Added: trunk/dports/science/volk-gnss-sdr/files/patch-Volk_GnssSdrConfig.cmake.next.diff
===================================================================
--- trunk/dports/science/volk-gnss-sdr/files/patch-Volk_GnssSdrConfig.cmake.next.diff (rev 0)
+++ trunk/dports/science/volk-gnss-sdr/files/patch-Volk_GnssSdrConfig.cmake.next.diff 2015-11-12 17:23:31 UTC (rev 142470)
@@ -0,0 +1,69 @@
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -147,7 +147,7 @@ if(NOT CMAKE_MODULES_DIR)
+ endif(NOT CMAKE_MODULES_DIR)
+
+ install(
+- FILES ${CMAKE_CURRENT_SOURCE_DIR}/cmake/VolkConfig.cmake
++ FILES ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Volk_GnssSdrConfig.cmake
+ DESTINATION ${CMAKE_MODULES_DIR}/volk_gnsssdr
+ COMPONENT "volk_gnsssdr_devel"
+ )
+--- cmake/VolkConfig.cmake
++++ /dev/null
+@@ -1,26 +0,0 @@
+-INCLUDE(FindPkgConfig)
+-PKG_CHECK_MODULES(PC_VOLK volk_gnsssdr)
+-
+-FIND_PATH(
+- VOLK_INCLUDE_DIRS
+- NAMES volk_gnsssdr/volk_gnsssdr.h
+- HINTS $ENV{VOLK_DIR}/include
+- ${PC_VOLK_INCLUDEDIR}
+- PATHS /usr/local/include
+- /usr/include
+-)
+-
+-FIND_LIBRARY(
+- VOLK_LIBRARIES
+- NAMES volk_gnsssdr
+- HINTS $ENV{VOLK_DIR}/lib
+- ${PC_VOLK_LIBDIR}
+- PATHS /usr/local/lib
+- /usr/local/lib64
+- /usr/lib
+- /usr/lib64
+-)
+-
+-INCLUDE(FindPackageHandleStandardArgs)
+-FIND_PACKAGE_HANDLE_STANDARD_ARGS(VOLK DEFAULT_MSG VOLK_LIBRARIES VOLK_INCLUDE_DIRS)
+-MARK_AS_ADVANCED(VOLK_LIBRARIES VOLK_INCLUDE_DIRS)
+--- /dev/null
++++ cmake/Volk_GnssSdrConfig.cmake
+@@ -0,0 +1,26 @@
++INCLUDE(FindPkgConfig)
++PKG_CHECK_MODULES(PC_VOLK volk_gnsssdr)
++
++FIND_PATH(
++ VOLK_INCLUDE_DIRS
++ NAMES volk_gnsssdr/volk_gnsssdr.h
++ HINTS $ENV{VOLK_DIR}/include
++ ${PC_VOLK_INCLUDEDIR}
++ PATHS /usr/local/include
++ /usr/include
++)
++
++FIND_LIBRARY(
++ VOLK_LIBRARIES
++ NAMES volk_gnsssdr
++ HINTS $ENV{VOLK_DIR}/lib
++ ${PC_VOLK_LIBDIR}
++ PATHS /usr/local/lib
++ /usr/local/lib64
++ /usr/lib
++ /usr/lib64
++)
++
++INCLUDE(FindPackageHandleStandardArgs)
++FIND_PACKAGE_HANDLE_STANDARD_ARGS(VOLK DEFAULT_MSG VOLK_LIBRARIES VOLK_INCLUDE_DIRS)
++MARK_AS_ADVANCED(VOLK_LIBRARIES VOLK_INCLUDE_DIRS)
Added: trunk/dports/science/volk-gnss-sdr/files/patch-Volk_GnssSdrConfig.cmake.release.diff
===================================================================
--- trunk/dports/science/volk-gnss-sdr/files/patch-Volk_GnssSdrConfig.cmake.release.diff (rev 0)
+++ trunk/dports/science/volk-gnss-sdr/files/patch-Volk_GnssSdrConfig.cmake.release.diff 2015-11-12 17:23:31 UTC (rev 142470)
@@ -0,0 +1,69 @@
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -147,7 +147,7 @@ if(NOT CMAKE_MODULES_DIR)
+ endif(NOT CMAKE_MODULES_DIR)
+
+ install(
+- FILES ${CMAKE_CURRENT_SOURCE_DIR}/cmake/VolkConfig.cmake
++ FILES ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Volk_GnssSdrConfig.cmake
+ DESTINATION ${CMAKE_MODULES_DIR}/volk_gnsssdr
+ COMPONENT "volk_gnsssdr_devel"
+ )
+--- cmake/VolkConfig.cmake
++++ /dev/null
+@@ -1,26 +0,0 @@
+-INCLUDE(FindPkgConfig)
+-PKG_CHECK_MODULES(PC_VOLK volk_gnsssdr)
+-
+-FIND_PATH(
+- VOLK_INCLUDE_DIRS
+- NAMES volk_gnsssdr/volk_gnsssdr.h
+- HINTS $ENV{VOLK_DIR}/include
+- ${PC_VOLK_INCLUDEDIR}
+- PATHS /usr/local/include
+- /usr/include
+-)
+-
+-FIND_LIBRARY(
+- VOLK_LIBRARIES
+- NAMES volk_gnsssdr
+- HINTS $ENV{VOLK_DIR}/lib
+- ${PC_VOLK_LIBDIR}
+- PATHS /usr/local/lib
+- /usr/local/lib64
+- /usr/lib
+- /usr/lib64
+-)
+-
+-INCLUDE(FindPackageHandleStandardArgs)
+-FIND_PACKAGE_HANDLE_STANDARD_ARGS(VOLK DEFAULT_MSG VOLK_LIBRARIES VOLK_INCLUDE_DIRS)
+-MARK_AS_ADVANCED(VOLK_LIBRARIES VOLK_INCLUDE_DIRS)
+--- /dev/null
++++ cmake/Volk_GnssSdrConfig.cmake
+@@ -0,0 +1,26 @@
++INCLUDE(FindPkgConfig)
++PKG_CHECK_MODULES(PC_VOLK volk_gnsssdr)
++
++FIND_PATH(
++ VOLK_INCLUDE_DIRS
++ NAMES volk_gnsssdr/volk_gnsssdr.h
++ HINTS $ENV{VOLK_DIR}/include
++ ${PC_VOLK_INCLUDEDIR}
++ PATHS /usr/local/include
++ /usr/include
++)
++
++FIND_LIBRARY(
++ VOLK_LIBRARIES
++ NAMES volk_gnsssdr
++ HINTS $ENV{VOLK_DIR}/lib
++ ${PC_VOLK_LIBDIR}
++ PATHS /usr/local/lib
++ /usr/local/lib64
++ /usr/lib
++ /usr/lib64
++)
++
++INCLUDE(FindPackageHandleStandardArgs)
++FIND_PACKAGE_HANDLE_STANDARD_ARGS(VOLK DEFAULT_MSG VOLK_LIBRARIES VOLK_INCLUDE_DIRS)
++MARK_AS_ADVANCED(VOLK_LIBRARIES VOLK_INCLUDE_DIRS)
Copied: trunk/dports/science/volk-gnss-sdr/files/patch-volk-include.release.diff (from rev 142469, trunk/dports/science/volk-gnss-sdr/files/patch-volk.diff)
===================================================================
--- trunk/dports/science/volk-gnss-sdr/files/patch-volk-include.release.diff (rev 0)
+++ trunk/dports/science/volk-gnss-sdr/files/patch-volk-include.release.diff 2015-11-12 17:23:31 UTC (rev 142470)
@@ -0,0 +1,19 @@
+--- include/volk_gnsssdr/volk_gnsssdr_complex.h.orig
++++ include/volk_gnsssdr/volk_gnsssdr_complex.h
+@@ -24,6 +24,9 @@
+ #ifndef INCLUDE_VOLK_COMPLEX_H
+ #define INCLUDE_VOLK_COMPLEX_H
+
++#ifndef INCLUDED_VOLK_COMPLEX_H
++#define INCLUDED_VOLK_COMPLEX_H
++
+ /*!
+ * \brief Provide typedefs and operators for all complex types in C and C++.
+ *
+@@ -106,4 +109,6 @@ typedef double complex lv_64fc_t;
+
+ #endif /* __cplusplus */
+
++#endif /* INCLUDED_VOLK_COMPLEX_H */
++
+ #endif /* INCLUDE_VOLK_COMPLEX_H */
Deleted: trunk/dports/science/volk-gnss-sdr/files/patch-volk.diff
===================================================================
--- trunk/dports/science/volk-gnss-sdr/files/patch-volk.diff 2015-11-12 16:41:55 UTC (rev 142469)
+++ trunk/dports/science/volk-gnss-sdr/files/patch-volk.diff 2015-11-12 17:23:31 UTC (rev 142470)
@@ -1,19 +0,0 @@
---- include/volk_gnsssdr/volk_gnsssdr_complex.h.orig
-+++ include/volk_gnsssdr/volk_gnsssdr_complex.h
-@@ -24,6 +24,9 @@
- #ifndef INCLUDE_VOLK_COMPLEX_H
- #define INCLUDE_VOLK_COMPLEX_H
-
-+#ifndef INCLUDED_VOLK_COMPLEX_H
-+#define INCLUDED_VOLK_COMPLEX_H
-+
- /*!
- * \brief Provide typedefs and operators for all complex types in C and C++.
- *
-@@ -106,4 +109,6 @@ typedef double complex lv_64fc_t;
-
- #endif /* __cplusplus */
-
-+#endif /* INCLUDED_VOLK_COMPLEX_H */
-+
- #endif /* INCLUDE_VOLK_COMPLEX_H */
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151212/67f02a4d/attachment-0001.html>
More information about the macports-changes
mailing list