[139959] trunk/dports/science/uhd

[michaelld at macports.org]

Revision: 139959
          https://trac.macports.org/changeset/139959
Author:   michaelld at macports.org
Date:     2015-09-04 08:44:26 -0700 (Fri, 04 Sep 2015)
Log Message:
-----------
uhd:
+ update devel to 8a6c4056 (20150903);
+ move integrated patch to release only.

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

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

Removed Paths:
-------------
    trunk/dports/science/uhd/files/patch-b200_fixes.diff

Modified: trunk/dports/science/uhd/Portfile
===================================================================
--- trunk/dports/science/uhd/Portfile	2015-09-04 15:10:20 UTC (rev 139958)
+++ trunk/dports/science/uhd/Portfile	2015-09-04 15:44:26 UTC (rev 139959)
@@ -33,6 +33,11 @@
 
     set UHD_VERSION_INFO "Release"
 
+    # temporary patch telling the user about detecting a bad USB state
+    # on startup & resetting it. Remove in 3.9.1.
+
+    patchfiles-append patch-b200_fixes.release.diff
+
     # overload the github livecheck regex to look for versions that
     # are just numbers and '_', no letters (e.g., "3.7.3_rc2").
 
@@ -47,10 +52,10 @@
 
     name            uhd-devel
     conflicts       uhd
-    github.setup    EttusResearch uhd d697bff4547b6a7fb95e127ec12e2989fc6fc2e5
-    version         20150831
-    checksums       rmd160 4256f545515c8e888587bec44b735130c72d1926 \
-                    sha256 c234ddaef4d6776087540e3ce96429c54a776b216465a0a53fbbb4063edf3b47
+    github.setup    EttusResearch uhd 8a6c4056921bdcb9c27c2b61f60102d5943230f5
+    version         20150903
+    checksums       rmd160 e602cadbf7eed9a172d2dd889ba6584b3c81852b \
+                    sha256 e790e6802cdc1f7b249666c9e0ba204a74195ba038e4b093ce8b51b6da5e513c
 
     # overload the github livecheck URL with the maint branch,
     # when it is more advanced; comment out for master.
@@ -71,11 +76,6 @@
 
 depends_build-append port:pkgconfig
 
-# temporary patch telling the user about detecting a bad USB state on
-# startup & resetting it.
-
-patchfiles-append patch-b200_fixes.diff
-
 # do VPATH (out of source tree) build
 
 cmake.out_of_source yes

Deleted: trunk/dports/science/uhd/files/patch-b200_fixes.diff
===================================================================
--- trunk/dports/science/uhd/files/patch-b200_fixes.diff	2015-09-04 15:10:20 UTC (rev 139958)
+++ trunk/dports/science/uhd/files/patch-b200_fixes.diff	2015-09-04 15:44:26 UTC (rev 139959)
@@ -1,10 +0,0 @@
---- host/lib/usrp/b200/b200_impl.cpp.orig
-+++ host/lib/usrp/b200/b200_impl.cpp
-@@ -259,6 +259,7 @@
-         return device::sptr(new b200_impl(device_addr, handle));
-     }
-     catch (const uhd::usb_error &e) {
-+        UHD_MSG(status) << "Detected bad USB state; resetting USB." << std::endl;
-         libusb::device_handle::sptr dev_handle(libusb::device_handle::get_cached_handle(
-             boost::static_pointer_cast<libusb::special_handle>(handle)->get_device()
-         ));

Copied: trunk/dports/science/uhd/files/patch-b200_fixes.release.diff (from rev 139958, trunk/dports/science/uhd/files/patch-b200_fixes.diff)
===================================================================
--- trunk/dports/science/uhd/files/patch-b200_fixes.release.diff	                        (rev 0)
+++ trunk/dports/science/uhd/files/patch-b200_fixes.release.diff	2015-09-04 15:44:26 UTC (rev 139959)
@@ -0,0 +1,10 @@
+--- host/lib/usrp/b200/b200_impl.cpp.orig
++++ host/lib/usrp/b200/b200_impl.cpp
+@@ -259,6 +259,7 @@
+         return device::sptr(new b200_impl(device_addr, handle));
+     }
+     catch (const uhd::usb_error &e) {
++        UHD_MSG(status) << "Detected bad USB state; resetting." << std::endl;
+         libusb::device_handle::sptr dev_handle(libusb::device_handle::get_cached_handle(
+             boost::static_pointer_cast<libusb::special_handle>(handle)->get_device()
+         ));
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150904/fbaf8ac9/attachment-0001.html>