Changeset 117706


Ignore:
Timestamp:
Mar 8, 2014, 8:35:23 PM (7 years ago)
Author:
michaelld@…
Message:

gnuradio:
+ update devel to 24dc96ad and next to 06dab563, both 20140307;
+ when +ctrlport, use ZeroC ICE 3.5;
+ patch docs building issue (temporary);
+ use devel patches for both devel and next.

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

Legend:

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

    r117666 r117706  
    9090        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.
    9191
    92     version             3.7.3_20140306
     92    version             3.7.3_20140307
    9393
    9494    conflicts           gnuradio-legacy gnuradio gnuradio-next
     
    9696    fetch.type          git
    9797    git.url             http://git.gnuradio.org/git/gnuradio.git
    98     git.branch          ca69ec5d64b67dfc714917bd94162a5d1f131d69
    99 
    100     patchfiles-append   patch-cmake-expand.devel.diff
     98    git.branch          24dc96ad6c445f905af9bc3eba1c56e97e3c429d
    10199
    102100    livecheck.url       http://gnuradio.org/cgit/cgit.cgi/gnuradio/log/?h=master
     
    111109        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.
    112110
    113     version             3.8.0_20140306
     111    version             3.8.0_20140307
    114112
    115113    conflicts           gnuradio-legacy gnuradio gnuradio-devel
     
    117115    fetch.type          git
    118116    git.url             http://git.gnuradio.org/git/gnuradio.git
    119     git.branch          6c8d0d26fb3c6f74dbceead8f68aa340ab8d7ade
     117    git.branch          06dab56378a89e39e14ff8ebf66745eee0955b31
    120118
    121119    livecheck.url       http://gnuradio.org/cgit/cgit.cgi/gnuradio/log/?h=next
    122120    livecheck.version   ${git.branch}
    123121    livecheck.regex     id=(\[a-f0-9\]+).*>next<
    124 
    125122}
    126123
     
    136133    if {[variant_isset ctrlport]} {
    137134
    138         depends_lib-append port:zeroc-ice34
     135        depends_lib-append port:zeroc-ice35
    139136        configure.args-append -DENABLE_GR_CTRLPORT=ON
    140137
     
    142139
    143140        configure.args-append -DENABLE_GR_CTRLPORT=OFF
     141
     142    }
     143
     144    if {${subport} ne "gnuradio"} {
     145
     146        # patches for devel and next (which are kept aligned for now)
     147
     148        # temporary patch to fix header creation to be before dependencies
     149        # are determined, such that local (to the build) headers are found
     150        # before already-installed ones.
     151
     152        patchfiles-append   patch-cmake-expand.devel.diff
     153
     154        # temporary patch to fix Doxygen building
     155
     156        patchfiles-append   patch-CMakeLists.txt.devel.diff
    144157
    145158    }
     
    347360                # required for runtime; so use depends_run.
    348361
    349                 depends_run-append port:py${s}-zeroc-ice34
     362                depends_run-append port:py${s}-zeroc-ice35
    350363
    351364            }
Note: See TracChangeset for help on using the changeset viewer.