[135264] trunk/dports/science/uhd

[michaelld at macports.org]

Revision: 135264
          https://trac.macports.org/changeset/135264
Author:   michaelld at macports.org
Date:     2015-04-20 12:31:18 -0700 (Mon, 20 Apr 2015)
Log Message:
-----------
uhd*: add temporary patch to fix building with Boost 1.58.

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

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

Modified: trunk/dports/science/uhd/Portfile
===================================================================
--- trunk/dports/science/uhd/Portfile	2015-04-20 19:29:38 UTC (rev 135263)
+++ trunk/dports/science/uhd/Portfile	2015-04-20 19:31:18 UTC (rev 135264)
@@ -71,6 +71,10 @@
 
 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

Added: trunk/dports/science/uhd/files/patch-boost-1.58.diff
===================================================================
--- trunk/dports/science/uhd/files/patch-boost-1.58.diff	                        (rev 0)
+++ trunk/dports/science/uhd/files/patch-boost-1.58.diff	2015-04-20 19:31:18 UTC (rev 135264)
@@ -0,0 +1,20 @@
+--- 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(
+ {
+     managed_recv_buffer::sptr buff = xport->get_recv_buff();
+     if (not buff or buff->size() < 8)
+-        return NULL;
++        return uhd::msg_task::msg_type_t(0,uhd::msg_task::msg_payload_t());
+ 
+     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(
+     default:
+         UHD_MSG(error) << "Got a ctrl packet with unknown SID " << sid << std::endl;
+     }
+-    return NULL;
++    return uhd::msg_task::msg_type_t(0,uhd::msg_task::msg_payload_t());
+ }
+ 
+ /***********************************************************************
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150420/93a1a6a9/attachment.html>