Revision: 139902 https://trac.macports.org/changeset/139902 Author: michaelld@macports.org Date: 2015-09-01 08:41:08 -0700 (Tue, 01 Sep 2015) Log Message: ----------- uhd: + update release to 3.9.0; + update devel to d697bff4 (20150831); + add temporary patch telling the user about detecting a bad USB state on startup & resetting it. Modified Paths: -------------- trunk/dports/science/uhd/Portfile Added Paths: ----------- trunk/dports/science/uhd/files/ trunk/dports/science/uhd/files/patch-b200_fixes.diff Modified: trunk/dports/science/uhd/Portfile =================================================================== --- trunk/dports/science/uhd/Portfile 2015-09-01 15:03:15 UTC (rev 139901) +++ trunk/dports/science/uhd/Portfile 2015-09-01 15:41:08 UTC (rev 139902) @@ -22,13 +22,12 @@ long_description ${description}: \ Provides the release version, which is typically updated every month or so. - set base_version 3.8.5 + set base_version 3.9.0 github.setup EttusResearch uhd 00[join [split ${base_version} "."] "_00"] release_ version ${base_version} - revision 1 conflicts uhd-devel - checksums rmd160 b571195eefc2a45fda31b1c466498ff146a76d62 \ - sha256 1b50adf39dab2a829998168f272319c4581ea1803dcb06bf462e70ba60e4abd1 + checksums rmd160 c71e795a7e60bd6de0167b6e703e8386eda43383 \ + sha256 794cb9240b406a7862282d2202467c98140e017d0ea9d8aa8e0544e95821bbe4 # set the version override string @@ -48,10 +47,10 @@ name uhd-devel conflicts uhd - github.setup EttusResearch uhd 719859693a794198dd27c46c119d16783abacd31 - version 20150818 - checksums rmd160 857394f63b5489d0e81843b4e38a844a9278d4ec \ - sha256 29fb36b3426d5e777e4b6de2f781ee340facc96cfdfd62a829eedb60a52b4b14 + github.setup EttusResearch uhd d697bff4547b6a7fb95e127ec12e2989fc6fc2e5 + version 20150831 + checksums rmd160 4256f545515c8e888587bec44b735130c72d1926 \ + sha256 c234ddaef4d6776087540e3ce96429c54a776b216465a0a53fbbb4063edf3b47 # overload the github livecheck URL with the maint branch, # when it is more advanced; comment out for master. @@ -72,6 +71,11 @@ 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 Added: trunk/dports/science/uhd/files/patch-b200_fixes.diff =================================================================== --- trunk/dports/science/uhd/files/patch-b200_fixes.diff (rev 0) +++ trunk/dports/science/uhd/files/patch-b200_fixes.diff 2015-09-01 15:41:08 UTC (rev 139902) @@ -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 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() + ));