[120367] trunk/dports/science/gnuradio
michaelld at macports.org
michaelld at macports.org
Sat May 24 13:32:21 PDT 2014
Revision: 120367
https://trac.macports.org/changeset/120367
Author: michaelld at macports.org
Date: 2014-05-24 13:32:21 -0700 (Sat, 24 May 2014)
Log Message:
-----------
gnuradio: update devel to 5cb67ced and next to 22b01e37, both 20140523.
Modified Paths:
--------------
trunk/dports/science/gnuradio/Portfile
trunk/dports/science/gnuradio/files/patch-cmake-expand.devel.diff
Modified: trunk/dports/science/gnuradio/Portfile
===================================================================
--- trunk/dports/science/gnuradio/Portfile 2014-05-24 19:37:45 UTC (rev 120366)
+++ trunk/dports/science/gnuradio/Portfile 2014-05-24 20:32:21 UTC (rev 120367)
@@ -93,16 +93,15 @@
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.
- github.setup gnuradio gnuradio cba2d184e2abb8a52353929a34b562ea4f9bd031
- version 3.7.4_20140520
- revision 1
+ github.setup gnuradio gnuradio 5cb67ced9b0735a6a7d0782c801ea0604153bef2
+ version 3.7.4_20140523
name gnuradio-devel
conflicts gnuradio-legacy gnuradio gnuradio-next
checksums \
- rmd160 673aa98e4a5cc9b2340c56bfacddafacca7755bc \
- sha256 0d8e006c086a9421798aa7d2b481e147d3b5919e44645689ceda50620610c9c2
+ rmd160 bd683883b6d2d2202ec10d7ddbd1bc5c42e626f2 \
+ sha256 fbb481a15e8238a05eefd36b7cc6eb77500f3b40a88cb5dd9bfce350dc2c1431
}
@@ -111,16 +110,15 @@
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.
- github.setup gnuradio gnuradio c38322bea953f6c33b530ea3b171eb3bcc39d916
- version 3.8.0_20140520
- revision 1
+ github.setup gnuradio gnuradio 22b01e3722fe8e7890ecb188f4ec6cfd3a5531c2
+ version 3.8.0_20140523
name gnuradio-next
conflicts gnuradio-legacy gnuradio gnuradio-devel
checksums \
- rmd160 c0ef14a81db958e22743a78d2d4ff1352b4327e8 \
- sha256 01cb26c48b1f95152d2eb4c49881148db6ec03b13be499f558a0a729e99f4775
+ rmd160 be6907c87e18cacc021658a3158f7824f90aecb5 \
+ sha256 e9099946ba45bdb2e53e563309362c7c798503a04e31c7062f6a7883212bc1fb
# overload the github livecheck URL with the correct branch
Modified: trunk/dports/science/gnuradio/files/patch-cmake-expand.devel.diff
===================================================================
--- trunk/dports/science/gnuradio/files/patch-cmake-expand.devel.diff 2014-05-24 19:37:45 UTC (rev 120366)
+++ trunk/dports/science/gnuradio/files/patch-cmake-expand.devel.diff 2014-05-24 20:32:21 UTC (rev 120367)
@@ -371,7 +371,7 @@
# Setup library
--- gr-blocks/include/gnuradio/blocks/CMakeLists.txt.orig
+++ gr-blocks/include/gnuradio/blocks/CMakeLists.txt
-@@ -18,80 +18,37 @@
+@@ -18,81 +18,38 @@
# Boston, MA 02110-1301, USA.
########################################################################
@@ -444,6 +444,7 @@
-expand_h(probe_signal_vX b s i f c)
-expand_h(sample_and_hold_XX bb ss ii ff)
-expand_h(sub_XX ss ii ff cc)
+-expand_h(tsb_vector_sink_X b s i f c)
-expand_h(xor_XX bb ss ii)
-expand_h(packed_to_unpacked_XX bb ss ii)
-expand_h(unpacked_to_packed_XX bb ss ii)
@@ -473,6 +474,7 @@
+GR_EXPAND_X_H(blocks probe_signal_vX b s i f c)
+GR_EXPAND_X_H(blocks sample_and_hold_XX bb ss ii ff)
+GR_EXPAND_X_H(blocks sub_XX ss ii ff cc)
++GR_EXPAND_X_H(blocks tsb_vector_sink_X b s i f c)
+GR_EXPAND_X_H(blocks xor_XX bb ss ii)
+GR_EXPAND_X_H(blocks packed_to_unpacked_XX bb ss ii)
+GR_EXPAND_X_H(blocks unpacked_to_packed_XX bb ss ii)
@@ -484,7 +486,7 @@
${generated_includes}
--- gr-blocks/lib/CMakeLists.txt.orig
+++ gr-blocks/lib/CMakeLists.txt
-@@ -23,101 +23,37 @@
+@@ -23,102 +23,38 @@
include(${CMAKE_CURRENT_SOURCE_DIR}/ConfigChecks.cmake)
########################################################################
@@ -576,6 +578,7 @@
-expand_cc_h_impl(probe_signal_X b s i f c)
-expand_cc_h_impl(probe_signal_vX b s i f c)
-expand_cc_h_impl(sample_and_hold_XX bb ss ii ff)
+-expand_cc_h_impl(tsb_vector_sink_X b s i f c)
-expand_cc_h_impl(sub_XX ss ii ff cc)
-expand_cc_h_impl(xor_XX bb ss ii)
-expand_cc_h_impl(packed_to_unpacked_XX bb ss ii)
@@ -606,6 +609,7 @@
+GR_EXPAND_X_CC_H_IMPL(blocks probe_signal_vX b s i f c)
+GR_EXPAND_X_CC_H_IMPL(blocks sample_and_hold_XX bb ss ii ff)
+GR_EXPAND_X_CC_H_IMPL(blocks sub_XX ss ii ff cc)
++GR_EXPAND_X_CC_H_IMPL(blocks tsb_vector_sink_X b s i f c)
+GR_EXPAND_X_CC_H_IMPL(blocks xor_XX bb ss ii)
+GR_EXPAND_X_CC_H_IMPL(blocks packed_to_unpacked_XX bb ss ii)
+GR_EXPAND_X_CC_H_IMPL(blocks unpacked_to_packed_XX bb ss ii)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140524/c4ff3a85/attachment.html>
More information about the macports-changes
mailing list