[128624] trunk/dports/science/uhd

[michaelld at macports.org]

Revision: 128624
          https://trac.macports.org/changeset/128624
Author:   michaelld at macports.org
Date:     2014-11-24 08:44:37 -0800 (Mon, 24 Nov 2014)
Log Message:
-----------
uhd:
+ add temporary patch to nirio compiling on some older compilers;
+ update devel to 3bed14aa (20141122).

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

Added Paths:
-----------
    trunk/dports/science/uhd/files/
    trunk/dports/science/uhd/files/patch-host_lib_transport_nirio_niriok_proxy_impl_v1.cpp.diff

Modified: trunk/dports/science/uhd/Portfile
===================================================================
--- trunk/dports/science/uhd/Portfile	2014-11-24 15:27:36 UTC (rev 128623)
+++ trunk/dports/science/uhd/Portfile	2014-11-24 16:44:37 UTC (rev 128624)
@@ -40,12 +40,12 @@
     long_description ${description}: \
 Provides the UHD GIT maint or master branch, depending on which is more advanced, and is typically updated every few days to week.
 
-    github.setup    EttusResearch uhd 7866b66587c7570890a24a7ebc89330976a8d81b
-    version         20141121
+    github.setup    EttusResearch uhd 3bed14aa13176d7fa110be08235c2c5678dd8a0c
+    version         20141122
     name            uhd-devel
     conflicts       uhd
-    checksums       rmd160 a52b357458d6fea4f262da9ff89d01370119ea56 \
-                    sha256 8eab78feaaecea082b8b339c35aff8a1727fae8d22a83368c93e14733f3c39c5
+    checksums       rmd160 99124a78721c3e9001676842e88ba9883e4e7fc5 \
+                    sha256 bd3f3eb7c5d5cfcc5ddb1425e3cddc378bd6635e60ef9196c26dac292145e156
 
     # overload the github livecheck URL with the maint branch,
     # when it is more advanced; comment out for master.
@@ -68,6 +68,11 @@
 configure.dir       ${workpath}/build
 build.dir           ${workpath}/build
 
+# temporary patch to fix nirio compiling on some older compilers;
+# this code is not actually used by OSX.
+
+patchfiles-append   patch-host_lib_transport_nirio_niriok_proxy_impl_v1.cpp.diff
+
 # remove top-level library path, such that internal libraries are used
 # instead of any already-installed ones.
 

Added: trunk/dports/science/uhd/files/patch-host_lib_transport_nirio_niriok_proxy_impl_v1.cpp.diff
===================================================================
--- trunk/dports/science/uhd/files/patch-host_lib_transport_nirio_niriok_proxy_impl_v1.cpp.diff	                        (rev 0)
+++ trunk/dports/science/uhd/files/patch-host_lib_transport_nirio_niriok_proxy_impl_v1.cpp.diff	2014-11-24 16:44:37 UTC (rev 128624)
@@ -0,0 +1,16 @@
+--- host/lib/transport/nirio/niriok_proxy_impl_v1.cpp.orig	2014-11-24 11:04:33.000000000 -0500
++++ host/lib/transport/nirio/niriok_proxy_impl_v1.cpp	2014-11-24 11:25:27.000000000 -0500
+@@ -285,9 +285,10 @@
+        niriok_proxy_impl_v1::nirio_syncop_out_params_t out = {};
+ 
+        in.function    = niriok_proxy_impl_v1::NIRIO_FUNC::ADD_RESOURCE;
+-       in.subfunction = (fifo_info.direction == OUTPUT_FIFO) ?
+-               niriok_proxy_impl_v1::NIRIO_RESOURCE::OUTPUT_FIFO :
+-               niriok_proxy_impl_v1::NIRIO_RESOURCE::INPUT_FIFO;
++       if (fifo_info.direction == OUTPUT_FIFO)
++	 in.subfunction = niriok_proxy_impl_v1::NIRIO_RESOURCE::OUTPUT_FIFO;
++       else
++	 in.subfunction = niriok_proxy_impl_v1::NIRIO_RESOURCE::INPUT_FIFO;
+ 
+        in.params.add.fifoWithDataType.channel        = fifo_info.channel;
+        in.params.add.fifoWithDataType.baseAddress    = fifo_info.base_addr;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141124/ea4abf99/attachment.html>