Revision: 118181 https://trac.macports.org/changeset/118181 Author: michaelld@macports.org Date: 2014-03-24 15:41:00 -0700 (Mon, 24 Mar 2014) Log 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). Modified Paths: -------------- trunk/dports/science/gnuradio/Portfile Removed Paths: ------------- trunk/dports/science/gnuradio/files/patch-gnuradio-runtime_swig_std_std_container.i.diff Modified: trunk/dports/science/gnuradio/Portfile =================================================================== --- trunk/dports/science/gnuradio/Portfile 2014-03-24 22:35:03 UTC (rev 118180) +++ trunk/dports/science/gnuradio/Portfile 2014-03-24 22:41:00 UTC (rev 118181) @@ -77,6 +77,11 @@ patchfiles-append patch-volk_gen_archs.xml.legacy.diff + # fix SWIG include of std_string to come before anything else, + # otherwise it will not be properly defined later on. + + patchfiles-append patch-gnuradio-core_swig_include-std_string.i.diff + # 3.6.5.1 is the last of the 3.6 API development livecheck.type none @@ -88,13 +93,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.4_20140318 + version 3.7.4_20140319 conflicts gnuradio-legacy gnuradio gnuradio-next fetch.type git git.url http://git.gnuradio.org/git/gnuradio.git - git.branch 49f69ee8d41fd4de62ce05630c38edabdfea8518 + git.branch 1092e685defd10692d3fa47435c716a88dfd8712 livecheck.url http://gnuradio.org/cgit/cgit.cgi/gnuradio/log/?h=master livecheck.version ${git.branch} @@ -107,17 +112,18 @@ 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_20140318 + version 3.8.0_20140319 conflicts gnuradio-legacy gnuradio gnuradio-devel fetch.type git git.url http://git.gnuradio.org/git/gnuradio.git - git.branch 99ecf64c8bb143f86d22b62b17cb18d64ce661d7 + git.branch 85ae8fc1e6b7397eb6dc774e2e4eaf8049265b13 livecheck.url http://gnuradio.org/cgit/cgit.cgi/gnuradio/log/?h=next livecheck.version ${git.branch} livecheck.regex id=(\[a-f0-9\]+).*>next< + } if {${subport} ne "gnuradio-legacy"} { @@ -150,10 +156,6 @@ patchfiles-append patch-cmake-expand.devel.diff - # temporary patch to fix fast_atan2f QA code - - patchfiles-append patch-gnuradio-runtime-lib-math-qa_fast_atan2f.cc.diff - } } @@ -174,32 +176,6 @@ configure.dir ${vpath} build.dir ${vpath} -# for 10.9, temporary fix to SWIG compile issue - -platform darwin 13 { - pre-patch { - if {${subport} eq "gnuradio-legacy"} { - # legacy has a different directory structure - set std_dest_dir ${worksrcpath}/gnuradio-core/src/lib/swig/std - if {[file exists ${std_dest_dir}]} { - delete ${std_dest_dir} - } - copy [glob ${prefix}/share/swig/*/std] ${std_dest_dir} - patchfiles-append \ - patch-gnuradio-core_swig_std_std_container.i.diff \ - patch-gnuradio-core_swig_include-std_string.i.diff - } else { - set std_dest_dir ${worksrcpath}/gnuradio-runtime/swig/std - if {[file exists ${std_dest_dir}]} { - delete ${std_dest_dir} - } - copy [glob ${prefix}/share/swig/*/std] ${std_dest_dir} - patchfiles-append \ - patch-gnuradio-runtime_swig_std_std_container.i.diff - } - } -} - # remove top-level include path, such that internal headers are used # instead of any already-installed ones. @@ -551,7 +527,7 @@ variant swig description "Install GNU Radio with support for SWIG-base Python bindings" { - depends_lib-append \ + depends_build-append \ port:swig-python configure.args-append \ Deleted: trunk/dports/science/gnuradio/files/patch-gnuradio-runtime_swig_std_std_container.i.diff =================================================================== --- trunk/dports/science/gnuradio/files/patch-gnuradio-runtime_swig_std_std_container.i.diff 2014-03-24 22:35:03 UTC (rev 118180) +++ trunk/dports/science/gnuradio/files/patch-gnuradio-runtime_swig_std_std_container.i.diff 2014-03-24 22:41:00 UTC (rev 118181) @@ -1,24 +0,0 @@ ---- gnuradio-runtime/swig/std/std_container.i.orig 2013-09-16 11:55:57.000000000 -0400 -+++ gnuradio-runtime/swig/std/std_container.i 2013-11-13 15:55:21.000000000 -0500 -@@ -46,8 +46,8 @@ - void resize(size_type new_size); - - #ifdef SWIG_EXPORT_ITERATOR_METHODS -- iterator erase(iterator pos); -- iterator erase(iterator first, iterator last); -+ iterator erase(const_iterator pos); -+ iterator erase(const_iterator first, const_iterator last); - #endif - - %enddef -@@ -68,8 +68,8 @@ - void resize(size_type new_size, const value_type& x); - - #ifdef SWIG_EXPORT_ITERATOR_METHODS -- iterator insert(iterator pos, const value_type& x); -- void insert(iterator pos, size_type n, const value_type& x); -+ iterator insert(const_iterator pos, const value_type& x); -+ void insert(const_iterator pos, size_type n, const value_type& x); - #endif - - %enddef