[135288] trunk/dports/science/uhd

[michaelld at macports.org]

Revision: 135288
          https://trac.macports.org/changeset/135288
Author:   michaelld at macports.org
Date:     2015-04-22 06:36:22 -0700 (Wed, 22 Apr 2015)
Log Message:
-----------
uhd:
+ update release to 3.8.3;
+ move boost 1.58 fix patch to be just for the release;
+ update devel to da800edf (20150421).

Modified Paths:
--------------
    trunk/dports/science/uhd/Portfile
    trunk/dports/science/uhd/files/patch-boost-1.58.diff

Modified: trunk/dports/science/uhd/Portfile
===================================================================
--- trunk/dports/science/uhd/Portfile	2015-04-22 12:55:07 UTC (rev 135287)
+++ trunk/dports/science/uhd/Portfile	2015-04-22 13:36:22 UTC (rev 135288)
@@ -21,18 +21,21 @@
     long_description ${description}: \
 Provides the release version, which is typically updated every month or so.
 
-    set base_version 3.8.2
+    set base_version 3.8.3
     github.setup    EttusResearch uhd 00[join [split ${base_version} "."] "_00"] release_
     version         ${base_version}
-    revision        1
     conflicts       uhd-devel
-    checksums       rmd160 5098bd64786f7e1b2adde1fc2b61466914dc1863 \
-                    sha256 589dc4498164954108b4ca2d90ebefe01806e4a33942bd9ae24a3b960c2d9b44
+    checksums       rmd160 1e026b8480c820ac36c53feb3f7e8b4fc10cae34 \
+                    sha256 c1c0d34dcdd8bc77ab2e853b347efd6db2b1ae777705b623631a552d5edfa251
 
     # set the version override string
 
     set UHD_VERSION_INFO "Release"
 
+    # patch to fix building using Boost 1.58+
+
+    patchfiles-append patch-boost-1.58.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 +50,10 @@
 
     name            uhd-devel
     conflicts       uhd
-    github.setup    EttusResearch uhd 2f760ac0f883e1de9adca48449498deab72a9359
-    version         20150414
-    checksums       rmd160 8184d0c3eeef823eff4642b85b2988b4e0ec05fd \
-                    sha256 1e4c5a19d36895fffd9357ab7a0c109c4fe5fbb6143ae218e82b16f021673e05
+    github.setup    EttusResearch uhd da800edf099db2adcb6b2fd4038cc6d15cdaf57f
+    version         20150421
+    checksums       rmd160 f7e738aed8af9be6a432509e0241413fefd208be \
+                    sha256 4f8e3baba0e7a6cd996203a023bd7e7de43ee027512f55e2f0ee3ec5e636bfd7
 
     # overload the github livecheck URL with the maint branch,
     # when it is more advanced; comment out for master.
@@ -71,10 +74,6 @@
 
 depends_build-append port:pkgconfig
 
-# temporary patch to fix building with Boost 1.58
-
-patchfiles-append    patch-boost-1.58.diff
-
 # do VPATH (out of source tree) build
 
 cmake.out_of_source yes

Modified: trunk/dports/science/uhd/files/patch-boost-1.58.diff
===================================================================
--- trunk/dports/science/uhd/files/patch-boost-1.58.diff	2015-04-22 12:55:07 UTC (rev 135287)
+++ trunk/dports/science/uhd/files/patch-boost-1.58.diff	2015-04-22 13:36:22 UTC (rev 135288)
@@ -1,6 +1,6 @@
 --- host/lib/usrp/b200/b200_io_impl.cpp.orig
 +++ host/lib/usrp/b200/b200_io_impl.cpp
-@@ -300,7 +300,7 @@ boost::optional<uhd::msg_task::msg_type_t> b200_impl::handle_async_task(
+@@ -194,7 +194,7 @@ boost::optional<uhd::msg_task::msg_type_t> b200_impl::handle_async_task(
  {
      managed_recv_buffer::sptr buff = xport->get_recv_buff();
      if (not buff or buff->size() < 8)
@@ -9,7 +9,7 @@
  
      const boost::uint32_t sid = uhd::wtohx(buff->cast<const boost::uint32_t *>()[1]);
      switch (sid) {
-@@ -364,7 +364,7 @@ boost::optional<uhd::msg_task::msg_type_t> b200_impl::handle_async_task(
+@@ -258,7 +258,7 @@ boost::optional<uhd::msg_task::msg_type_t> b200_impl::handle_async_task(
      default:
          UHD_MSG(error) << "Got a ctrl packet with unknown SID " << sid << std::endl;
      }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150422/75c3379d/attachment.html>