Changeset 117735


Ignore:
Timestamp:
Mar 10, 2014, 1:22:27 PM (7 years ago)
Author:
michaelld@…
Message:

gnuradio:
+ update release to 3.7.3;
+ update devel to 69dcaa75 and next to aedd3caf, both 20140308;
+ remove integrated patch;
+ update release patch.

Location:
trunk/dports/science/gnuradio
Files:
1 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/science/gnuradio/Portfile

    r117706 r117735  
    2323if {${subport} eq ${name}} {
    2424
    25     version         3.7.2.1
    26     revision        2
     25    version         3.7.3
    2726
    2827    long_description    ${description}: \
     
    3635
    3736    checksums \
    38         rmd160 14a04753ce6185daa92ebcb6619df9c130a70757 \
    39         sha256 8c6b7e1fda31e9228bdd62a137af901b28757d7e1b044de2e985b96e53c83c80
     37        rmd160 f4f8d707694ac8524025ccd4cfb3e47fd3a17204 \
     38        sha256 1c71d1819a67bac4148c619fc2a7d2c0ea0b0d08aa4660a11d65ab7b713b5231
    4039
    4140    patchfiles-append \
     
    9089        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.
    9190
    92     version             3.7.3_20140307
     91    version             3.7.4_20140308
    9392
    9493    conflicts           gnuradio-legacy gnuradio gnuradio-next
     
    9695    fetch.type          git
    9796    git.url             http://git.gnuradio.org/git/gnuradio.git
    98     git.branch          24dc96ad6c445f905af9bc3eba1c56e97e3c429d
     97    git.branch          69dcaa75b629af4ebc465a073f54af84b7c75a11
    9998
    10099    livecheck.url       http://gnuradio.org/cgit/cgit.cgi/gnuradio/log/?h=master
     
    109108        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.
    110109
    111     version             3.8.0_20140307
     110    version             3.8.0_20140308
    112111
    113112    conflicts           gnuradio-legacy gnuradio gnuradio-devel
     
    115114    fetch.type          git
    116115    git.url             http://git.gnuradio.org/git/gnuradio.git
    117     git.branch          06dab56378a89e39e14ff8ebf66745eee0955b31
     116    git.branch          aedd3caf18f161a22323fc6533463ec554e94c37
    118117
    119118    livecheck.url       http://gnuradio.org/cgit/cgit.cgi/gnuradio/log/?h=next
     
    151150
    152151        patchfiles-append   patch-cmake-expand.devel.diff
    153 
    154         # temporary patch to fix Doxygen building
    155 
    156         patchfiles-append   patch-CMakeLists.txt.devel.diff
    157152
    158153    }
  • trunk/dports/science/gnuradio/files/patch-cmake-expand.release.diff

    r117181 r117735  
    372372--- gr-blocks/include/gnuradio/blocks/CMakeLists.txt.orig
    373373+++ gr-blocks/include/gnuradio/blocks/CMakeLists.txt
    374 @@ -18,79 +18,36 @@
     374@@ -18,80 +18,38 @@
    375375 # Boston, MA 02110-1301, USA.
    376376 
     
    380380 ########################################################################
    381381-include(GrPython)
    382 -
     382 
    383383-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py "
    384384-#!${PYTHON_EXECUTABLE}
     
    423423-# Invoke macro to generate various sources
    424424-########################################################################
     425-expand_h(abs_XX             ss ii ff)
    425426-expand_h(add_XX             ss ii cc)
    426427-expand_h(add_const_XX       bb ss ii ff cc)
     
    451452-expand_h(vector_source_X    b s i f c)
    452453+include(GrMiscUtils)
     454+GR_EXPAND_X_H(blocks abs_XX             ss ii ff)
    453455+GR_EXPAND_X_H(blocks add_XX             ss ii cc)
    454456+GR_EXPAND_X_H(blocks add_const_XX       bb ss ii ff cc)
     
    483485--- gr-blocks/lib/CMakeLists.txt.orig
    484486+++ gr-blocks/lib/CMakeLists.txt
    485 @@ -23,100 +23,36 @@
     487@@ -23,101 +23,37 @@
    486488 include(${CMAKE_CURRENT_SOURCE_DIR}/ConfigChecks.cmake)
    487489 
     
    554556 # Invoke macro to generate various sources
    555557 ########################################################################
     558-expand_cc_h_impl(abs_XX             ss ii ff)
    556559-expand_cc_h_impl(add_XX             ss ii cc)
    557560-expand_cc_h_impl(add_const_XX       bb ss ii ff cc)
     
    582585-expand_cc_h_impl(vector_source_X    b s i f c)
    583586+include(GrMiscUtils)
     587+GR_EXPAND_X_CC_H_IMPL(blocks abs_XX             ss ii ff)
    584588+GR_EXPAND_X_CC_H_IMPL(blocks add_XX             ss ii cc)
    585589+GR_EXPAND_X_CC_H_IMPL(blocks add_const_XX       bb ss ii ff cc)
     
    858862-    list(APPEND expanded_files_h ${CMAKE_CURRENT_BINARY_DIR}/${name}.h)
    859863-  endforeach(sig)
    860 - 
     864-
    861865-  #create a command to generate the files
    862866-  add_custom_command(
     
    925929-    list(APPEND expanded_files_h  ${CMAKE_CURRENT_BINARY_DIR}/${name}.h)
    926930-  endforeach(sig)
    927 - 
     931-
    928932-  #create a command to generate the source files
    929933-  add_custom_command(
     
    943947-    ${root} ${root}.h.t ${ARGN}
    944948-  )
    945 - 
     949-
    946950-  #make source files depends on headers to force generation
    947951-  set_source_files_properties(${expanded_files_cc}
    948952-    PROPERTIES OBJECT_DEPENDS "${expanded_files_h}"
    949953-  )
    950 - 
     954-
    951955-  #install rules for the generated cc files
    952 -  list(APPEND generated_sources ${expanded_files_cc}) 
    953 -  list(APPEND generated_headers ${expanded_files_h}) 
     956-  list(APPEND generated_sources ${expanded_files_cc})
     957-  list(APPEND generated_headers ${expanded_files_h})
    954958-endmacro(expand_cc)
    955959-
Note: See TracChangeset for help on using the changeset viewer.