Revision: 140535 https://trac.macports.org/changeset/140535 Author: michaelld@macports.org Date: 2015-09-21 18:28:07 -0700 (Mon, 21 Sep 2015) Log Message: ----------- gnss-sdr: + update devel and next to b6654445 (20150918); + move patches to be for release only. Modified Paths: -------------- trunk/dports/science/gnss-sdr/Portfile Modified: trunk/dports/science/gnss-sdr/Portfile =================================================================== --- trunk/dports/science/gnss-sdr/Portfile 2015-09-22 01:26:19 UTC (rev 140534) +++ trunk/dports/science/gnss-sdr/Portfile 2015-09-22 01:28:07 UTC (rev 140535) @@ -32,6 +32,16 @@ require_active_variants port:gnuradio uhd + # temporary patch to fix Volk #define in compatibility + + patchfiles-append patch-volk.diff + + # temporary patch; will be fixed in next release. + + post-patch { + reinplace "s@multithread@opencl@g" ${worksrcpath}/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.cc + } + } subport gnss-sdr-devel { @@ -40,10 +50,10 @@ This port is kept up with the GNSS-SDR GIT master branch, which is typically updated daily to weekly. This version of GNSS-SDR generally contains fixes and new features that will be incorporated in an upcoming release, and compiles against the gnuradio-devel port, which represents GNU Radio GIT master branch. 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 gnss-sdr and gnuradio ports, cleaning any current builds, and trying again. name gnss-sdr-devel - github.setup gnss-sdr gnss-sdr f64af5e6edc69b001b4cf66779a4d343c95f0180 - version 20150902 - checksums rmd160 c52020f2a36e038ba66c90977ee9d5f866ba26ae \ - sha256 34865a8ed0ba691b3db3f52ab8ba4a5e5466712d3722fdda9751165acbb997e5 + github.setup gnss-sdr gnss-sdr b665444550e90bf595ade110cd57d69cf98145b9 + version 20150918 + checksums rmd160 b6681236a4376d72cb606572e1ca0e3767b63681 \ + sha256 22a4f14e3f84d45d10025499272d406c7a6ef427b0f22df04491dd3a28ce561b conflicts gnss-sdr gnss-sdr-next @@ -58,10 +68,10 @@ This port is kept up with the GNSS-SDR GIT next branch, which is typically updated daily to weekly. This version of GNSS-SDR generally contains fixes and new features that will be incorporated in an upcoming release, and compiles against the gnuradio-next port, which represents GNU Radio GIT next branch. 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 gnss-sdr and gnuradio ports, cleaning any current builds, and trying again. name gnss-sdr-next - github.setup gnss-sdr gnss-sdr 5ad8b87f68d80fcb9ff05ff02f452752e31674ba - version 20150906 - checksums rmd160 dcfab721f26bac3cbe47fe8b8fe607cd0b1bbc31 \ - sha256 08fc54488d9dccaee460339297d97410d33a547a43df33d58b4a4fa66d19dba2 + github.setup gnss-sdr gnss-sdr b665444550e90bf595ade110cd57d69cf98145b9 + version 20150918 + checksums rmd160 b6681236a4376d72cb606572e1ca0e3767b63681 \ + sha256 22a4f14e3f84d45d10025499272d406c7a6ef427b0f22df04491dd3a28ce561b conflicts gnss-sdr gnss-sdr-devel @@ -89,17 +99,6 @@ require_active_variants port:google-glog gflags -# temporary patch to fix Volk #define in compatibility - -patchfiles-append patch-volk.diff - -# temporary patch; will be fixed in next release; this is in some of -# the distros already, but it won't hurt to it for all ports. - -post-patch { - reinplace "s@multithread@opencl@g" ${worksrcpath}/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.cc -} - # do VPATH (out of source tree) build cmake.out_of_source yes