Revision: 149071 https://trac.macports.org/changeset/149071 Author: michaelld@macports.org Date: 2016-05-28 06:06:30 -0700 (Sat, 28 May 2016) Log Message: ----------- gnuradio: update devel to 0e1b7106 and next to 0b22497e, both 20160527; add temporary patch to fix Volk max index API usage. Modified Paths: -------------- trunk/dports/science/gnuradio/Portfile Added Paths: ----------- trunk/dports/science/gnuradio/files/patch-fix_volk_max_index_uint16_t.diff Modified: trunk/dports/science/gnuradio/Portfile =================================================================== --- trunk/dports/science/gnuradio/Portfile 2016-05-28 12:55:18 UTC (rev 149070) +++ trunk/dports/science/gnuradio/Portfile 2016-05-28 13:06:30 UTC (rev 149071) @@ -51,11 +51,11 @@ name gnuradio-devel conflicts gnuradio gnuradio-next - github.setup gnuradio gnuradio 681846ff4f16388482ed7c6fb2a53e31e553e6a2 - version 20160516 + github.setup gnuradio gnuradio 0e1b7106f64a81bbf6a6a6fd85b291d1a406ac0e + version 20160527 checksums \ - rmd160 62568f37935ce2ff079c00f8e996841490171c88 \ - sha256 9ce5ea0e9751d732da2b03933e4d8d167de6b873b043e8f42a57b03a1c4cacb2 + rmd160 852ccb1bae93d4c57962cac68d33d4be041dedab \ + sha256 4aa5b2733d401bcee6ecce29bd3e3996d6b964c6e91cf674cc296e969fb5085e # set the version override string @@ -71,11 +71,11 @@ name gnuradio-next conflicts gnuradio gnuradio-devel - github.setup gnuradio gnuradio 5c910950a0c872a52c8dc875b0c108c0f2609c30 - version 20160516 + github.setup gnuradio gnuradio 0b22497e22e1d0842c6d41a12998a616c31dce3f + version 20160527 checksums \ - rmd160 5f0ec8e49bc198fc751ce9314d44ffb9ccd3cd6d \ - sha256 7c9433f0e1ec9d27d083f4fc80bd06348c6125f09d0c923b4472193b9e60bbe7 + rmd160 bc2b5d187308f7deed791a395af6941f3d497d00 \ + sha256 241c239ee9525404200c7e768eaa03f333b82cdd82811373f920484f0b52b138 # set the version override string @@ -107,6 +107,11 @@ patchfiles-append \ patch-cmake-expand.devel.diff + # temporary patch to fix volk max index API usage + + patchfiles-append \ + patch-fix_volk_max_index_uint16_t.diff + } # override githib PortGroup homepage setting Added: trunk/dports/science/gnuradio/files/patch-fix_volk_max_index_uint16_t.diff =================================================================== --- trunk/dports/science/gnuradio/files/patch-fix_volk_max_index_uint16_t.diff (rev 0) +++ trunk/dports/science/gnuradio/files/patch-fix_volk_max_index_uint16_t.diff 2016-05-28 13:06:30 UTC (rev 149071) @@ -0,0 +1,11 @@ +--- gr-dtv/lib/dvbt/dvbt_ofdm_sym_acquisition_impl.cc.orig ++++ gr-dtv/lib/dvbt/dvbt_ofdm_sym_acquisition_impl.cc +@@ -47,7 +47,7 @@ namespace gr { + int + dvbt_ofdm_sym_acquisition_impl::peak_detect_process(const float * datain, const int datain_length, int * peak_pos, int * peak_max) + { +- unsigned int peak_index = 0; ++ uint16_t peak_index = 0; + int peak_pos_length = 0; + + volk_32f_index_max_16u(&peak_index, &datain[0], datain_length);