<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/706a2cf0e9d0d3eca254fcf032446f312641268b">https://github.com/macports/macports-ports/commit/706a2cf0e9d0d3eca254fcf032446f312641268b</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 706a2cf gnuradio-next: update to 45d0e42f (20181112)
</span>706a2cf is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 706a2cf0e9d0d3eca254fcf032446f312641268b
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Wed Nov 14 15:08:31 2018 -0800
<span style='display:block; white-space:pre;color:#404040;'> gnuradio-next: update to 45d0e42f (20181112)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> + move to GIT master branch;
</span><span style='display:block; white-space:pre;color:#404040;'> + add patches to fix build.
</span>---
science/gnuradio/Portfile | 44 ++++++++++++++--------
.../gnuradio/files/patch-C_CXX_STANDARD.next.diff | 6 +--
science/gnuradio/files/patch-fix-GNUCXX.next.diff | 27 +++++++++++++
science/gnuradio/files/patch-fix-mp.next.diff | 42 +++++++++++++++++++++
science/gnuradio/files/patch-fix_clang.next.diff | 13 +------
.../files/patch-fix_ctrlport_test.next.diff | 32 +++++++---------
6 files changed, 116 insertions(+), 48 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gnuradio/Portfile b/science/gnuradio/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index cd14ac1..e06b677 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gnuradio/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gnuradio/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -74,27 +74,21 @@ subport gnuradio-devel {
</span> subport gnuradio-next {
long_description ${description}: \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- This port is kept up with the GNU Radio GIT 'next' branch, which is typically updated daily to weekly. This version of GNU Radio represents the next major release of GNU Radio, and hence its API is likely to be different than that provided by either gnuradio or gnuradio-devel. This port may or not compile or function correctly, as it represents a work in progress. If it does not work, check back in a few days. Or try deactivating the currently active gnuradio port, cleaning a [...]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ This port is kept up with the GNU Radio GIT 'master' branch (as of 2018-09-20), which is typically updated daily to weekly. This version of GNU Radio represents the next major release of GNU Radio, and hence its API is likely to be different than that provided by either gnuradio or gnuradio-devel. This port may or not compile or function correctly, as it represents a work in progress. If it does not work, check back in a few days. Or try deactivating the currently active gnur [...]
</span>
name gnuradio-next
conflicts gnuradio gnuradio-devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup gnuradio gnuradio b9c8c6c3dad2c864655786c8f6ce22910c82e174
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20180730
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 ac44a2a7b73d3fc0a5ee1e8e2da81590e4f7e9fc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 10f08721df90cd639ef0257047698426349d5d05ee44128c23a4804e20019e17 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3629856
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup gnuradio gnuradio 45d0e42fe5e0380e860675c1b6032dcccf22d083
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20181112
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 542b8d0b02fc526bc905e095d9b59b6ac6b3b1af \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 3c1734fe10c1c44545ea16b1dd5f5405335ad12576ea51e05c90e673d624bd23 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3599291
</span>
# set the version override string
set GR_VERSION_INFO "next-git-[string range ${github.version} 0 7](${version})"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # overload the github livecheck branch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- github.livecheck.branch next
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> }
if {${subport} eq "gnuradio"} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -153,10 +147,6 @@ if {${subport} eq "gnuradio"} {
</span>
# patches for next
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # force expansion of CMake-based template files
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-cmake-expand.next.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # temporary patch to allow COMPILER_ID match
# with Clang and AppleClang
patchfiles-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -172,6 +162,17 @@ if {${subport} eq "gnuradio"} {
</span> patchfiles-append \
patch-C_CXX_STANDARD.next.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # temporary patch to fix use of GNUCXX to instead be for both GNU
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # and Clang compilers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-fix-GNUCXX.next.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # temporary patch to fix type usage of MP package
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-fix-mp.next.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> }
platform darwin 10 {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -263,6 +264,17 @@ if {${subport} eq "gnuradio"} {
</span> # next
depends_run-append port:adwaita-icon-theme
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Require MPIR (or devel); don't use GMP for now
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append path:lib/libmpir.dylib:mpir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DGMP_INCLUDE_DIR= \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DGMP_LIBRARY= \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DGMPXX_LIBRARY= \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DMPIR_INCLUDE_DIR=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DMPIR_LIBRARY=${prefix}/lib/libmpir.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DMPIRXX_LIBRARY=/opt/local/lib/libmpirxx.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> }
# need matplotlib for polar encoder/decoder, runtime
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gnuradio/files/patch-C_CXX_STANDARD.next.diff b/science/gnuradio/files/patch-C_CXX_STANDARD.next.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index e01c1de..eab9cc7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gnuradio/files/patch-C_CXX_STANDARD.next.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gnuradio/files/patch-C_CXX_STANDARD.next.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- CMakeLists.txt.orig
+++ CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -131,12 +131,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -130,12 +130,16 @@
</span> MESSAGE(status "Skipping compiler version check.")
ENDIF()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,7 +22,7 @@
</span>
IF(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
SET(CMAKE_CXX_STANDARD 11)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -145,9 +149,60 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -144,9 +148,60 @@
</span> ELSEIF(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
SET(CMAKE_CXX_STANDARD 11)
ELSE()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -84,7 +84,7 @@
</span> IF(CMAKE_C_COMPILER_ID STREQUAL "GNU")
SET(CMAKE_C_STANDARD 11)
ELSEIF(CMAKE_C_COMPILER_ID MATCHES "Clang")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -155,10 +210,64 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -154,10 +209,64 @@
</span> ELSEIF(CMAKE_C_COMPILER_ID STREQUAL "MSVC")
SET(CMAKE_C_STANDARD 11)
ELSE()
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gnuradio/files/patch-fix-GNUCXX.next.diff b/science/gnuradio/files/patch-fix-GNUCXX.next.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..d74d87f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gnuradio/files/patch-fix-GNUCXX.next.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,27 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -302,16 +302,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ########################################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include(GrMiscUtils) #compiler flag check
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if(CMAKE_COMPILER_IS_GNUCXX AND NOT WIN32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- #http://gcc.gnu.org/wiki/Visibility
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- GR_ADD_CXX_COMPILER_FLAG_IF_AVAILABLE(-fvisibility=hidden HAVE_VISIBILITY_HIDDEN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if(CMAKE_COMPILER_IS_GNUCXX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(NOT WIN32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #http://gcc.gnu.org/wiki/Visibility
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ GR_ADD_CXX_COMPILER_FLAG_IF_AVAILABLE(-fvisibility=hidden HAVE_VISIBILITY_HIDDEN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif(NOT WIN32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GR_ADD_CXX_COMPILER_FLAG_IF_AVAILABLE(-Wsign-compare HAVE_WARN_SIGN_COMPARE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GR_ADD_CXX_COMPILER_FLAG_IF_AVAILABLE(-Wall HAVE_WARN_ALL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GR_ADD_CXX_COMPILER_FLAG_IF_AVAILABLE(-Wno-uninitialized HAVE_WARN_NO_UNINITIALIZED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif(CMAKE_COMPILER_IS_GNUCXX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++endif(CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(MSVC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include_directories(${CMAKE_SOURCE_DIR}/cmake/msvc) #missing headers
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gnuradio/files/patch-fix-mp.next.diff b/science/gnuradio/files/patch-fix-mp.next.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..7f564ef
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gnuradio/files/patch-fix-mp.next.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,42 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gnuradio-runtime/lib/block.cc.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gnuradio-runtime/lib/block.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -194,13 +194,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ block::set_relative_rate(uint64_t interpolation, uint64_t decimation)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mpz_class interp, decim;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (interpolation < 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ throw std::invalid_argument("block::set_relative_rate: interpolation rate cannot be 0");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (decimation < 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ throw std::invalid_argument("block::set_relative_rate: decimation rate cannot be 0");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- d_mp_relative_rate = mpq_class(interpolation, decimation);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mpz_import(interp.get_mpz_t(), 1, 1, sizeof(interpolation), 0, 0, &interpolation);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mpz_import(decim.get_mpz_t(), 1, 1, sizeof(decimation), 0, 0, &decimation);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ d_mp_relative_rate = mpq_class (interp, decim);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ d_mp_relative_rate.canonicalize();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ d_relative_rate = d_mp_relative_rate.get_d();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gnuradio-runtime/lib/block_executor.cc.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gnuradio-runtime/lib/block_executor.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -146,7 +146,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mpz_class offset;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for(t = rtags.begin(); t != rtags.end(); t++) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tag_t new_tag = *t;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- offset = new_tag.offset * mp_rrate + one_half;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mpz_import(offset.get_mpz_t(), 1, 1, sizeof(new_tag.offset), 0, 0, &new_tag.offset);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ offset *= mp_rrate + one_half;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ new_tag.offset = offset.get_ui();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for(int o = 0; o < d->noutputs(); o++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ out_buf[o]->add_item_tag(new_tag);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -188,7 +189,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mpz_class offset;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for(t = rtags.begin(); t != rtags.end(); t++) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tag_t new_tag = *t;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- offset = new_tag.offset * mp_rrate + one_half;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mpz_import(offset.get_mpz_t(), 1, 1, sizeof(new_tag.offset), 0, 0, &new_tag.offset);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ offset *= mp_rrate + one_half;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ new_tag.offset = offset.get_ui();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ out_buf->add_item_tag(new_tag);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gnuradio/files/patch-fix_clang.next.diff b/science/gnuradio/files/patch-fix_clang.next.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index b8cc9c4..50a24a4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gnuradio/files/patch-fix_clang.next.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gnuradio/files/patch-fix_clang.next.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +1,6 @@
</span> --- CMakeLists.txt.orig
+++ CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -100,7 +100,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ELSE()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MESSAGE(WARNING "\nCannot determine the version of the compiler selected to build GNU Radio (GCC : ${CMAKE_CXX_COMPILER}). This build may or not work. We highly recommend using GCC version ${GCC_MIN_VERSION} or more recent.")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ENDIF()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ELSEIF(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ELSEIF(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXECUTE_PROCESS(COMMAND
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${CMAKE_CXX_COMPILER} -v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- RESULT_VARIABLE _res ERROR_VARIABLE _err
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -140,7 +140,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -139,7 +139,7 @@
</span>
IF(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
SET(CMAKE_CXX_STANDARD 11)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,7 +9,7 @@
</span> SET(CMAKE_CXX_STANDARD 11)
ELSEIF(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
SET(CMAKE_CXX_STANDARD 11)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -150,7 +150,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -149,7 +149,7 @@
</span>
IF(CMAKE_C_COMPILER_ID STREQUAL "GNU")
SET(CMAKE_C_STANDARD 11)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gnuradio/files/patch-fix_ctrlport_test.next.diff b/science/gnuradio/files/patch-fix_ctrlport_test.next.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 1fd29c1..4fdc225 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gnuradio/files/patch-fix_ctrlport_test.next.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gnuradio/files/patch-fix_ctrlport_test.next.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +1,16 @@
</span> --- gnuradio-runtime/lib/CMakeLists.txt.orig
+++ gnuradio-runtime/lib/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -46,19 +46,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -44,7 +44,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ list(APPEND gnuradio_runtime_sources ${CMAKE_CURRENT_BINARY_DIR}/constants.cc)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> ########################################################################
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Setup the include and linker paths
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# Setup the include and linker paths
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Setup globally used include paths
</span> ########################################################################
<span style='display:block; white-space:pre;background:#ffe0e0;'>--include_directories(${GNURADIO_RUNTIME_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ${CMAKE_CURRENT_SOURCE_DIR}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ${CMAKE_CURRENT_BINARY_DIR}/../include/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ${VOLK_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ${Boost_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+include_directories(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ${GNURADIO_RUNTIME_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ${CMAKE_CURRENT_SOURCE_DIR}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ${CMAKE_CURRENT_BINARY_DIR}/../include/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ${VOLK_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ${Boost_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include_directories(${GNURADIO_RUNTIME_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${CMAKE_CURRENT_SOURCE_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -53,12 +53,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${MPLIB_INCLUDE_DIRS}
</span> )
-if(ENABLE_CTRLPORT_THRIFT)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,20 +22,20 @@
</span> ########################################################################
# Include subdirs rather to populate to the sources lists.
########################################################################
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -69,6 +64,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -68,6 +62,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GR_INCLUDE_SUBDIRECTORY(math)
</span> GR_INCLUDE_SUBDIRECTORY(controlport)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ########################################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++########################################################################
</span> +# Setup CTRLPORT include path, if using
+########################################################################
+if(ENABLE_CTRLPORT_THRIFT)
+ include_directories(${THRIFT_INCLUDE_DIRS})
+endif(ENABLE_CTRLPORT_THRIFT)
+
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+########################################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ########################################################################
</span> # Setup library
########################################################################
<span style='display:block; white-space:pre;background:#ffe0e0;'>- list(APPEND gnuradio_runtime_sources
</span> --- gnuradio-runtime/lib/controlport/CMakeLists.txt.orig
+++ gnuradio-runtime/lib/controlport/CMakeLists.txt
@@ -17,15 +17,18 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -93,7 +89,7 @@
</span> -endif(ENABLE_GR_CTRLPORT)
--- gr-blocks/python/blocks/CMakeLists.txt.orig
+++ gr-blocks/python/blocks/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -43,13 +43,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -45,13 +45,13 @@
</span> file(GLOB py_qa_test_files "qa_*.py")
# Force out the controlport QA tests if we have no backends to use.
</pre><pre style='margin:0'>
</pre>