Revision: 117455 https://trac.macports.org/changeset/117455 Author: michaelld@macports.org Date: 2014-02-27 04:45:50 -0800 (Thu, 27 Feb 2014) Log Message: ----------- gnuradio: update devel to 67882eec and next to 9fe1cca4, both 20140226. Modified Paths: -------------- trunk/dports/science/gnuradio/Portfile trunk/dports/science/gnuradio/files/patch-cmake-expand.devel.diff Modified: trunk/dports/science/gnuradio/Portfile =================================================================== --- trunk/dports/science/gnuradio/Portfile 2014-02-27 07:40:08 UTC (rev 117454) +++ trunk/dports/science/gnuradio/Portfile 2014-02-27 12:45:50 UTC (rev 117455) @@ -89,13 +89,13 @@ long_description ${description}: \ This port is kept up with the GNU Radio GIT 'master' branch, which is typically updated daily to weekly. This version of GNU Radio generally contains fixes to, and its API is compatible with, the current GNU Radio release, and will be incorporated in an upcoming release. 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 gnuradio port, cleaning any current builds, and trying again. - version 3.7.3_20140216 + version 3.7.3_20140226 conflicts gnuradio-legacy gnuradio gnuradio-next fetch.type git git.url http://git.gnuradio.org/git/gnuradio.git - git.branch cf8997ccc1e9c543aa234e561e7f002a176e13dc + git.branch 67882eec57a36c1c2537845760504b27c758607e patchfiles-append patch-cmake-expand.devel.diff @@ -110,13 +110,13 @@ long_description ${description}: \ This port is kept up with the GNU Radio GIT 'next' branch, which is typically updated daily to weekly. This version of GNU Radio represents the next major release of GNU Radio, and hence its API is likely to be different than that provided by either gnuradio or gnuradio-devel. 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 gnuradio port, cleaning any current builds, and trying again. - version 3.8.0_20140216 + version 3.8.0_20140226 conflicts gnuradio-legacy gnuradio gnuradio-devel fetch.type git git.url http://git.gnuradio.org/git/gnuradio.git - git.branch a41a1e1b4f326ad12864142575418f9ed848656a + git.branch 9fe1cca4f5bd04d0af4c25cbf08929a34fa487e3 livecheck.url http://gnuradio.org/cgit/cgit.cgi/gnuradio/log/?h=next livecheck.version ${git.branch} Modified: trunk/dports/science/gnuradio/files/patch-cmake-expand.devel.diff =================================================================== --- trunk/dports/science/gnuradio/files/patch-cmake-expand.devel.diff 2014-02-27 07:40:08 UTC (rev 117454) +++ trunk/dports/science/gnuradio/files/patch-cmake-expand.devel.diff 2014-02-27 12:45:50 UTC (rev 117455) @@ -371,7 +371,7 @@ # Setup library --- gr-blocks/include/gnuradio/blocks/CMakeLists.txt.orig +++ gr-blocks/include/gnuradio/blocks/CMakeLists.txt -@@ -18,79 +18,36 @@ +@@ -18,80 +18,38 @@ # Boston, MA 02110-1301, USA. ######################################################################## @@ -379,7 +379,7 @@ +# Invoke macro to generate various headers ######################################################################## -include(GrPython) -- + -file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py " -#!${PYTHON_EXECUTABLE} - @@ -422,6 +422,7 @@ -######################################################################## -# Invoke macro to generate various sources -######################################################################## +-expand_h(abs_XX ss ii ff) -expand_h(add_XX ss ii cc) -expand_h(add_const_XX bb ss ii ff cc) -expand_h(add_const_vXX bb ss ii ff cc) @@ -450,6 +451,7 @@ -expand_h(vector_sink_X b s i f c) -expand_h(vector_source_X b s i f c) +include(GrMiscUtils) ++GR_EXPAND_X_H(blocks abs_XX ss ii ff) +GR_EXPAND_X_H(blocks add_XX ss ii cc) +GR_EXPAND_X_H(blocks add_const_XX bb ss ii ff cc) +GR_EXPAND_X_H(blocks add_const_vXX bb ss ii ff cc) @@ -482,7 +484,7 @@ ${generated_includes} --- gr-blocks/lib/CMakeLists.txt.orig +++ gr-blocks/lib/CMakeLists.txt -@@ -23,100 +23,36 @@ +@@ -23,101 +23,37 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/ConfigChecks.cmake) ######################################################################## @@ -553,6 +555,7 @@ -######################################################################## # Invoke macro to generate various sources ######################################################################## +-expand_cc_h_impl(abs_XX ss ii ff) -expand_cc_h_impl(add_XX ss ii cc) -expand_cc_h_impl(add_const_XX bb ss ii ff cc) -expand_cc_h_impl(add_const_vXX bb ss ii ff cc) @@ -581,6 +584,7 @@ -expand_cc_h_impl(vector_sink_X b s i f c) -expand_cc_h_impl(vector_source_X b s i f c) +include(GrMiscUtils) ++GR_EXPAND_X_CC_H_IMPL(blocks abs_XX ss ii ff) +GR_EXPAND_X_CC_H_IMPL(blocks add_XX ss ii cc) +GR_EXPAND_X_CC_H_IMPL(blocks add_const_XX bb ss ii ff cc) +GR_EXPAND_X_CC_H_IMPL(blocks add_const_vXX bb ss ii ff cc)