[139301] trunk/dports/science/uhd

[michaelld at macports.org]

Revision: 139301
          https://trac.macports.org/changeset/139301
Author:   michaelld at macports.org
Date:     2015-08-11 12:10:01 -0700 (Tue, 11 Aug 2015)
Log Message:
-----------
uhd-devel:
+ update to 46342c08 (20150810);
+ add temporary patch to fix USB startup error handling.

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

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

Modified: trunk/dports/science/uhd/Portfile
===================================================================
--- trunk/dports/science/uhd/Portfile	2015-08-11 15:51:45 UTC (rev 139300)
+++ trunk/dports/science/uhd/Portfile	2015-08-11 19:10:01 UTC (rev 139301)
@@ -47,11 +47,15 @@
 
     name            uhd-devel
     conflicts       uhd
-    github.setup    EttusResearch uhd 9e0a423ed180244eaf9832de02ce55e68ce817f0
-    version         20150803
-    checksums       rmd160 9dca8e65b4665e3d76a276813038ab84ee3843ba \
-                    sha256 a29c31713aef16361824d6e84b5129fa6060cf3582e91c5c106b13d073eb9c0a
+    github.setup    EttusResearch uhd 46342c082d851d05afae8c94421d35ea3cf881eb
+    version         20150810
+    checksums       rmd160 10deade695a849e8f5ca2d1f98442468b09c6b21 \
+                    sha256 62e39a35c0f08b879fff04970d8d7d6b887121c83f9bc7577d9193535df487b9
 
+    # temporary patch to fix USB startup error handling
+
+    patchfiles-append patch-libusb1_zero_copy.diff
+
     # overload the github livecheck URL with the maint branch,
     # when it is more advanced; comment out for master.
 

Added: trunk/dports/science/uhd/files/patch-libusb1_zero_copy.diff
===================================================================
--- trunk/dports/science/uhd/files/patch-libusb1_zero_copy.diff	                        (rev 0)
+++ trunk/dports/science/uhd/files/patch-libusb1_zero_copy.diff	2015-08-11 19:10:01 UTC (rev 139301)
@@ -0,0 +1,22 @@
+--- host/lib/transport/libusb1_zero_copy.cpp.orig
++++ host/lib/transport/libusb1_zero_copy.cpp
+@@ -139,8 +139,8 @@
+ #endif
+         const int ret = libusb_submit_transfer(_lut);
+         if (ret != LIBUSB_SUCCESS)
+-            throw uhd::runtime_error(str(boost::format("usb %s submit failed: %s")
+-                                         % _name % libusb_strerror((libusb_error)ret)));
++	  throw uhd::usb_error(ret, str(boost::format(
++            "usb %s submit failed: %s") % _name % libusb_error_name(ret)));
+     }
+ 
+     template <typename buffer_type>
+@@ -353,7 +353,7 @@
+                 _enqueued.push_back(_released.front());
+                 _released.pop_front();
+             }
+-            catch (uhd::runtime_error& e)
++            catch (uhd::usb_error& e)
+             {
+                 _status = STATUS_ERROR;
+                 throw e;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150811/1621a7a7/attachment.html>