[119063] trunk/dports/science/uhd

[michaelld at macports.org]

Revision: 119063
          https://trac.macports.org/changeset/119063
Author:   michaelld at macports.org
Date:     2014-04-16 06:17:31 -0700 (Wed, 16 Apr 2014)
Log Message:
-----------
uhd-devel:
+ update to 6bd9fed2 (20140415);
+ add temporary patch to fix default over-the-wire type size issue.

Modified Paths:
--------------
    trunk/dports/science/uhd/Portfile

Added Paths:
-----------
    trunk/dports/science/uhd/files/
    trunk/dports/science/uhd/files/patch-host_lib_usrp_multi_usrp.cpp.diff

Modified: trunk/dports/science/uhd/Portfile
===================================================================
--- trunk/dports/science/uhd/Portfile	2014-04-16 08:00:04 UTC (rev 119062)
+++ trunk/dports/science/uhd/Portfile	2014-04-16 13:17:31 UTC (rev 119063)
@@ -35,13 +35,18 @@
     long_description ${description}: \
 Provides the GIT master version, which is typically updated every few days to week.
 
-    github.setup    EttusResearch uhd 87b068edddf5862f532dbc06e7a20106e524b581
-    version         ${base_version}_20140411
+    github.setup    EttusResearch uhd 6bd9fed25f702bf6b2a244c6c045e3945ad165a5
+    version         ${base_version}_20140415
     name            uhd-devel
     conflicts       uhd
-    checksums       rmd160 ccf80e02b1da8c78cb3b65c1bad4eaf45536b0c8 \
-                    sha256 bf6c4f34d3bcee6ba16245be39d2c9f9558ed2121670faa631a5b05bb3c426e2
+    checksums       rmd160 7bdabfc2136a4c26a63399f78e86b6f5aa00e28b \
+                    sha256 ed3c450d7c033b44761734e33018d7b80a51f39158761f8a7a714ce36c5b1df8
 
+    # temporary patch to fix over-the-wire item size issue introduced
+    # in d52f4490 (20140228) in combination with a change in GNU Radio.
+
+    patchfiles-append patch-host_lib_usrp_multi_usrp.cpp.diff
+
 }
 
 depends_lib-append	 port:boost port:ncurses

Added: trunk/dports/science/uhd/files/patch-host_lib_usrp_multi_usrp.cpp.diff
===================================================================
--- trunk/dports/science/uhd/files/patch-host_lib_usrp_multi_usrp.cpp.diff	                        (rev 0)
+++ trunk/dports/science/uhd/files/patch-host_lib_usrp_multi_usrp.cpp.diff	2014-04-16 13:17:31 UTC (rev 119063)
@@ -0,0 +1,11 @@
+--- host/lib/usrp/multi_usrp.cpp.orig	2014-04-16 08:50:57.000000000 -0400
++++ host/lib/usrp/multi_usrp.cpp	2014-04-16 08:51:21.000000000 -0400
+@@ -1196,7 +1196,7 @@
+     // Assumption is that all mboards use the same link
+     bool _check_link_rate(const stream_args_t &args, bool is_tx) {
+         bool link_rate_is_ok = true;
+-        size_t bytes_per_sample = convert::get_bytes_per_item(args.otw_format);
++        size_t bytes_per_sample = convert::get_bytes_per_item(args.otw_format.empty() ? "sc16" : args.otw_format);
+         double max_link_rate = 0;
+         double sum_rate = 0;
+         BOOST_FOREACH(const size_t chan, args.channels) {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140416/597897cb/attachment.html>