[133747] trunk/dports/science/uhd

[michaelld at macports.org]

Revision: 133747
          https://trac.macports.org/changeset/133747
Author:   michaelld at macports.org
Date:     2015-03-10 07:11:56 -0700 (Tue, 10 Mar 2015)
Log Message:
-----------
uhd-devel: update to a55b5a09 (20150309).

Modified Paths:
--------------
    trunk/dports/science/uhd/Portfile
    trunk/dports/science/uhd/files/patch-32_bit_and_warnings.diff

Modified: trunk/dports/science/uhd/Portfile
===================================================================
--- trunk/dports/science/uhd/Portfile	2015-03-10 13:12:45 UTC (rev 133746)
+++ trunk/dports/science/uhd/Portfile	2015-03-10 14:11:56 UTC (rev 133747)
@@ -47,10 +47,10 @@
 
     name            uhd-devel
     conflicts       uhd
-    github.setup    EttusResearch uhd 33edac343488fdd87337e308b277adca69f16819
-    version         20150305
-    checksums       rmd160 663f67fe253b1e015832f5dd37e44445b2654d72 \
-                    sha256 85b7ddc1420224cc6b5f5b29497f4a9371e4bcb0432dad7ebee632380b23f959
+    github.setup    EttusResearch uhd a55b5a097da01606f23209713bf1ce754be5b7d3
+    version         20150309
+    checksums       rmd160 3dbdbc68f0426a4ef8c4bf1f3db59d449ed663d3 \
+                    sha256 84f9a0df85549d2b54f359425cfefe033e91903ccf7851eafd9cf14fc7695126
 
     # overload the github livecheck URL with the maint branch,
     # when it is more advanced; comment out for master.

Modified: trunk/dports/science/uhd/files/patch-32_bit_and_warnings.diff
===================================================================
--- trunk/dports/science/uhd/files/patch-32_bit_and_warnings.diff	2015-03-10 13:12:45 UTC (rev 133746)
+++ trunk/dports/science/uhd/files/patch-32_bit_and_warnings.diff	2015-03-10 14:11:56 UTC (rev 133747)
@@ -274,17 +274,6 @@
  
  int synth_cal_lut[53][12] = {   {10, 0, 4, 0, 15, 8, 8, 13, 4, 13, 15, 9},
                                  {10, 0, 4, 0, 15, 8, 9, 13, 4, 13, 15, 9},
---- host/lib/usrp/e300/e300_ublox_control_impl.cpp.orig
-+++ host/lib/usrp/e300/e300_ublox_control_impl.cpp
-@@ -498,7 +498,7 @@ control::sptr control::make(const std::string &node, const size_t baud_rate)
- #else
- using namespace uhd::usrp::gps::ublox::ubx;
- 
--control::sptr control::make(const std::string &node, const size_t baud_rate)
-+control::sptr control::make(const std::string& /* node */, const size_t /* baud_rate */)
- {
-     throw uhd::assertion_error("control::sptr::make: !E300_NATIVE");
- }
 --- host/tests/chdr_test.cpp.orig
 +++ host/tests/chdr_test.cpp
 @@ -81,7 +81,7 @@ BOOST_AUTO_TEST_CASE(test_with_chdr){
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150310/8dd93469/attachment.html>