Changeset 118181


Ignore:
Timestamp:
Mar 24, 2014, 10:41:00 PM (7 years ago)
Author:
michaelld@…
Message:

gnuradio:
+ update devel to 1092e685 and next to 85ae8fc1, both 20140319;
+ remove swig hack, not needed with swig 3.0.0;
+ make swig-python a build dependency;
+ remove fast_atan2f temporary patch (integrated upstream).

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

Legend:

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

    r118019 r118181  
    7878    patchfiles-append patch-volk_gen_archs.xml.legacy.diff
    7979
     80    # fix SWIG include of std_string to come before anything else,
     81    # otherwise it will not be properly defined later on.
     82
     83    patchfiles-append patch-gnuradio-core_swig_include-std_string.i.diff
     84
    8085    # 3.6.5.1 is the last of the 3.6 API development
    8186
     
    8994        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.
    9095
    91     version             3.7.4_20140318
     96    version             3.7.4_20140319
    9297
    9398    conflicts           gnuradio-legacy gnuradio gnuradio-next
     
    95100    fetch.type          git
    96101    git.url             http://git.gnuradio.org/git/gnuradio.git
    97     git.branch          49f69ee8d41fd4de62ce05630c38edabdfea8518
     102    git.branch          1092e685defd10692d3fa47435c716a88dfd8712
    98103
    99104    livecheck.url       http://gnuradio.org/cgit/cgit.cgi/gnuradio/log/?h=master
     
    108113        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.
    109114
    110     version             3.8.0_20140318
     115    version             3.8.0_20140319
    111116
    112117    conflicts           gnuradio-legacy gnuradio gnuradio-devel
     
    114119    fetch.type          git
    115120    git.url             http://git.gnuradio.org/git/gnuradio.git
    116     git.branch          99ecf64c8bb143f86d22b62b17cb18d64ce661d7
     121    git.branch          85ae8fc1e6b7397eb6dc774e2e4eaf8049265b13
    117122
    118123    livecheck.url       http://gnuradio.org/cgit/cgit.cgi/gnuradio/log/?h=next
    119124    livecheck.version   ${git.branch}
    120125    livecheck.regex     id=(\[a-f0-9\]+).*>next<
     126
    121127}
    122128
     
    150156
    151157        patchfiles-append   patch-cmake-expand.devel.diff
    152 
    153         # temporary patch to fix fast_atan2f QA code
    154 
    155         patchfiles-append   patch-gnuradio-runtime-lib-math-qa_fast_atan2f.cc.diff
    156158
    157159    }
     
    174176configure.dir       ${vpath}
    175177build.dir           ${vpath}
    176 
    177 # for 10.9, temporary fix to SWIG compile issue
    178 
    179 platform darwin 13 {
    180     pre-patch {
    181         if {${subport} eq "gnuradio-legacy"} {
    182             # legacy has a different directory structure
    183             set std_dest_dir ${worksrcpath}/gnuradio-core/src/lib/swig/std
    184             if {[file exists ${std_dest_dir}]} {
    185                 delete ${std_dest_dir}
    186             }
    187             copy [glob ${prefix}/share/swig/*/std] ${std_dest_dir}
    188             patchfiles-append \
    189                 patch-gnuradio-core_swig_std_std_container.i.diff \
    190                 patch-gnuradio-core_swig_include-std_string.i.diff
    191         } else {
    192             set std_dest_dir ${worksrcpath}/gnuradio-runtime/swig/std
    193             if {[file exists ${std_dest_dir}]} {
    194                 delete ${std_dest_dir}
    195             }
    196             copy [glob ${prefix}/share/swig/*/std] ${std_dest_dir}
    197             patchfiles-append \
    198                 patch-gnuradio-runtime_swig_std_std_container.i.diff
    199         }
    200     }
    201 }
    202178
    203179# remove top-level include path, such that internal headers are used
     
    552528variant swig description "Install GNU Radio with support for SWIG-base Python bindings" {
    553529
    554     depends_lib-append \
     530    depends_build-append \
    555531        port:swig-python
    556532
Note: See TracChangeset for help on using the changeset viewer.