Revision: 121566 https://trac.macports.org/changeset/121566 Author: michaelld@macports.org Date: 2014-06-30 09:41:55 -0700 (Mon, 30 Jun 2014) Log Message: ----------- gnuradio: update devel to c98699ee and next to 877c507a, both 20140629. 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-06-30 14:56:26 UTC (rev 121565) +++ trunk/dports/science/gnuradio/Portfile 2014-06-30 16:41:55 UTC (rev 121566) @@ -93,15 +93,15 @@ 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. - github.setup gnuradio gnuradio 9a7222577bc5425b17b513b94e0de73e847bd9da - version 3.7.4_20140627 + github.setup gnuradio gnuradio c98699ee1492e3899fad68e54537953f7d440b10 + version 3.7.4_20140629 name gnuradio-devel conflicts gnuradio-legacy gnuradio gnuradio-next checksums \ - rmd160 0fc0ad863c748fababff3d94d30c8d1d1dedc03c \ - sha256 825b60af03876056061eea836ae8a298213efea2ca8a8f8f3f42519a6eb199ad + rmd160 d51d266b61225c85314c12df58ee597ddded7ead \ + sha256 49a96f45a6f8fe52c2eb9bcf0150724b0060e7e9a4e11ca90954425d29b6148e } @@ -110,15 +110,15 @@ 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. - github.setup gnuradio gnuradio 3ddbfe5dc4616b8932208c0dd78e28b7b229992b - version 3.8.0_20140627 + github.setup gnuradio gnuradio 877c507ae03447625fb6979e37a5a24e152f8462 + version 3.8.0_20140629 name gnuradio-next conflicts gnuradio-legacy gnuradio gnuradio-devel checksums \ - rmd160 3f6abad9d68a697795dffa098b09e31648cfbce5 \ - sha256 7694ad3a4f37ebbe1e2dbe436c99aa15995636485590a9a0b700827089dff5b9 + rmd160 22c6f449292dc7527ba8612e9ce48ad887ef638d \ + sha256 e02270e73c97d1a2fde5628de1b769fcdbcdca429644010eebd7d7d1fbde529e # overload the github livecheck URL with the correct branch Modified: trunk/dports/science/gnuradio/files/patch-cmake-expand.devel.diff =================================================================== --- trunk/dports/science/gnuradio/files/patch-cmake-expand.devel.diff 2014-06-30 14:56:26 UTC (rev 121565) +++ trunk/dports/science/gnuradio/files/patch-cmake-expand.devel.diff 2014-06-30 16:41:55 UTC (rev 121566) @@ -326,7 +326,7 @@ - list(APPEND expanded_files_cc ${CMAKE_CURRENT_BINARY_DIR}/${name}.cc) - list(APPEND expanded_files_h ${CMAKE_CURRENT_BINARY_DIR}/${name}.h) - endforeach(sig) -- +- - #create a command to generate the source files - add_custom_command( - OUTPUT ${expanded_files_cc} @@ -344,15 +344,15 @@ - ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py - ${root} ${root}.h.t ${ARGN} - ) -- +- - #make source files depends on headers to force generation - set_source_files_properties(${expanded_files_cc} - PROPERTIES OBJECT_DEPENDS "${expanded_files_h}" - ) -- +- - #install rules for the generated cc files -- list(APPEND generated_sources ${expanded_files_cc}) -- list(APPEND generated_headers ${expanded_files_h}) +- list(APPEND generated_sources ${expanded_files_cc}) +- list(APPEND generated_headers ${expanded_files_h}) -endmacro(expand_cc) - - @@ -1065,12 +1065,12 @@ # # This file is part of GNU Radio # -@@ -37,79 +37,20 @@ if(ENABLE_GR_CTRLPORT) - include_directories(${ICE_INCLUDE_DIR}) +@@ -38,78 +38,19 @@ if(ENABLE_GR_CTRLPORT) endif(ENABLE_GR_CTRLPORT) --####################################################################### + ####################################################################### -# generate the python helper script which calls into the build utils ++# Invoke macro to generate various sources and headers ######################################################################## -include(GrPython) - @@ -1100,7 +1100,7 @@ - list(APPEND expanded_files_cc ${CMAKE_CURRENT_BINARY_DIR}/${name}.cc) - list(APPEND expanded_files_h ${CMAKE_CURRENT_BINARY_DIR}/${name}.h) - endforeach(sig) -- +- - #create a command to generate the source files - add_custom_command( - OUTPUT ${expanded_files_cc} @@ -1118,21 +1118,20 @@ - ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py - ${root} ${root}.h.t ${ARGN} - ) -- +- - #make source files depends on headers to force generation - set_source_files_properties(${expanded_files_cc} - PROPERTIES OBJECT_DEPENDS "${expanded_files_h}" - ) -- +- - #install rules for the generated cc files -- list(APPEND generated_sources ${expanded_files_cc}) -- list(APPEND generated_headers ${expanded_files_h}) +- list(APPEND generated_sources ${expanded_files_cc}) +- list(APPEND generated_headers ${expanded_files_h}) -endmacro(expand_cc) - -######################################################################## -# Invoke macro to generate various sources -+# Invoke macro to generate various sources and headers - ######################################################################## +-######################################################################## -expand_cc(encoder_XX_impl bb bs bi ss si ii) -expand_cc(sccc_encoder_XX_impl bb bs bi ss si ii) -expand_cc(pccc_encoder_XX_impl bb bs bi ss si ii)