<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/6e01eb5b4945c0fc20fba6352f575dc33a1e4028">https://github.com/macports/macports-ports/commit/6e01eb5b4945c0fc20fba6352f575dc33a1e4028</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 6e01eb5 bladeRF: update to 6116d090 (20170809).
</span>6e01eb5 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 6e01eb5b4945c0fc20fba6352f575dc33a1e4028
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Thu Aug 10 14:37:51 2017 -0400
<span style='display:block; white-space:pre;color:#404040;'> bladeRF: update to 6116d090 (20170809).
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Remove integrated patches.
</span>---
science/bladeRF/Portfile | 14 +++------
science/bladeRF/files/patch-clock_gettime.diff | 29 -------------------
science/bladeRF/files/patch-reverse_b6f62672.diff | 35 -----------------------
3 files changed, 4 insertions(+), 74 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/bladeRF/Portfile b/science/bladeRF/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 718eb54..1119ec5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/bladeRF/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/bladeRF/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,10 +4,10 @@ PortSystem 1.0
</span> PortGroup cmake 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup Nuand bladeRF 037e2886f2bfee42af99d77581d3cf9a23c64227
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 20170801
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 33ece54e1c12cd53f29378230de63dad7244da48 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 95ff2f8ea9a531ab6c759a441e11b7daf6c3fcb47406e18441394d7c805dedce
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup Nuand bladeRF 6116d090494943c41656a4852d2183f9d68d9a2c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 20170809
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 90e71c19d435b3377ac9a2258e745dd0a315937b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 263f0be80226cc8a60562488ee13f39c975f8c28bbcd8295a1213e56b801b541
</span>
categories science comms
maintainers michaelld openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,12 +19,6 @@ platforms darwin
</span> depends_build-append port:pkgconfig
depends_lib-append path:lib/libusb-1.0.dylib:libusb
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# temporary patches to fix use of clock_gettime
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-reverse_b6f62672.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-clock_gettime.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # do VPATH (out of source tree) build
cmake.out_of_source yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/bladeRF/files/patch-clock_gettime.diff b/science/bladeRF/files/patch-clock_gettime.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index bb773a8..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/bladeRF/files/patch-clock_gettime.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,29 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- host/CMakeLists.txt.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ host/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -152,6 +152,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${CMAKE_CURRENT_LIST_DIR}/common/include/osx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # 'clock_gettime' and related are defined on OSX as of 10.12.0 (16.0.0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(${CMAKE_SYSTEM_VERSION} VERSION_LESS 16.0.0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ add_definitions(-D_OSX_NEED_CLOCK_GETTIME)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- elseif(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(BLADERF_OS_WINDOWS 1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- host/common/include/osx/clock_gettime.h.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ host/common/include/osx/clock_gettime.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -35,10 +35,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # error "This file is intended for use with OSX systems only."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef _OSX_NEED_CLOCK_GETTIME
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typedef int clockid_t;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define CLOCK_REALTIME 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int clock_gettime(clockid_t clk_id, struct timespec *tp);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* _OSX_NEED_CLOCK_GETTIME */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef __cplusplus
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } /* extern "C" */
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/bladeRF/files/patch-reverse_b6f62672.diff b/science/bladeRF/files/patch-reverse_b6f62672.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 47e746c..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/bladeRF/files/patch-reverse_b6f62672.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,35 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- host/common/include/osx/clock_gettime.h.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ host/common/include/osx/clock_gettime.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -27,10 +27,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <time.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include "AvailabilityMacros.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_12
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef __cplusplus
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern "C" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -49,5 +45,3 @@ int clock_gettime(clockid_t clk_id, struct timespec *tp);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- host/common/src/osx/clock_gettime.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ host/common/src/osx/clock_gettime.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,7 +1,3 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include "AvailabilityMacros.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_12
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * clock_gettime() wrapper for OSX based upon jbenet's github "gist":
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * https://gist.github.com/jbenet/1087739
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -60,5 +56,3 @@ clock_gettime_out:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span></pre><pre style='margin:0'>
</pre>