<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/e983bd96455095dba9c5d81bf8f83f7c44f06095">https://github.com/macports/macports-ports/commit/e983bd96455095dba9c5d81bf8f83f7c44f06095</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 e983bd9 gnuradio-next: update to 31885c7d (20181126), removing integrated patches
</span>e983bd9 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e983bd96455095dba9c5d81bf8f83f7c44f06095
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Wed Nov 28 12:18:12 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> gnuradio-next: update to 31885c7d (20181126), removing integrated patches
</span>---
science/gnuradio/Portfile | 31 +++-------------
science/gnuradio/files/patch-fix-GNUCXX.next.diff | 27 --------------
...-ctrlport-python-app-install-location.next.diff | 11 ------
science/gnuradio/files/patch-fix-mp.next.diff | 42 ----------------------
science/gnuradio/files/patch-fix_clang.next.diff | 20 -----------
5 files changed, 5 insertions(+), 126 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 7e2b01e..bbe7676 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;'>@@ -76,11 +76,11 @@ subport gnuradio-next {
</span> name gnuradio-next
conflicts gnuradio gnuradio-devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup gnuradio gnuradio 45d0e42fe5e0380e860675c1b6032dcccf22d083
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20181112
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 542b8d0b02fc526bc905e095d9b59b6ac6b3b1af \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 3c1734fe10c1c44545ea16b1dd5f5405335ad12576ea51e05c90e673d624bd23 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3599291
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup gnuradio gnuradio 31885c7da227418f0f9dc5c4f55daba5fd04a7c0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20181126
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 f91e45d620633a1e308f61a8ee5293fc3ea8e4ac \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 fce81ee76f29b57bdd1e2bfc0782a6f4077160f85c5f3dd01e4c67150819a167 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3588079
</span>
# set the version override string
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -160,11 +160,6 @@ if {${subport} eq "gnuradio"} {
</span>
# patches for next
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # temporary patch to allow COMPILER_ID match
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # with Clang and AppleClang
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-fix_clang.next.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # temporary patch to fix CTRLPORT testing
patchfiles-append \
patch-fix_ctrlport_test.next.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -175,22 +170,6 @@ if {${subport} eq "gnuradio"} {
</span> patchfiles-append \
patch-C_CXX_STANDARD.next.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # temporary patch to fix use of GNUCXX to instead be for both GNU
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # and Clang compilers
</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-fix-GNUCXX.next.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # temporary patch to fix type usage of MP package
</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-fix-mp.next.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # temporary patch to fix installing CTRLPORT Python apps location
</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-fix-ctrlport-python-app-install-location.next.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> }
platform darwin 10 {
<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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index d74d87f..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gnuradio/files/patch-fix-GNUCXX.next.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,27 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -302,16 +302,17 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ########################################################################
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include(GrMiscUtils) #compiler flag check
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if(CMAKE_COMPILER_IS_GNUCXX AND NOT WIN32)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- #http://gcc.gnu.org/wiki/Visibility
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- GR_ADD_CXX_COMPILER_FLAG_IF_AVAILABLE(-fvisibility=hidden HAVE_VISIBILITY_HIDDEN)
</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;'>--if(CMAKE_COMPILER_IS_GNUCXX)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(NOT WIN32)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #http://gcc.gnu.org/wiki/Visibility
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ GR_ADD_CXX_COMPILER_FLAG_IF_AVAILABLE(-fvisibility=hidden HAVE_VISIBILITY_HIDDEN)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ endif(NOT WIN32)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GR_ADD_CXX_COMPILER_FLAG_IF_AVAILABLE(-Wsign-compare HAVE_WARN_SIGN_COMPARE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GR_ADD_CXX_COMPILER_FLAG_IF_AVAILABLE(-Wall HAVE_WARN_ALL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GR_ADD_CXX_COMPILER_FLAG_IF_AVAILABLE(-Wno-uninitialized HAVE_WARN_NO_UNINITIALIZED)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--endif(CMAKE_COMPILER_IS_GNUCXX)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+endif(CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(MSVC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 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-ctrlport-python-app-install-location.next.diff b/science/gnuradio/files/patch-fix-ctrlport-python-app-install-location.next.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3f41c82..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gnuradio/files/patch-fix-ctrlport-python-app-install-location.next.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gnuradio-runtime/python/gnuradio/ctrlport/CMakeLists.txt.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gnuradio-runtime/python/gnuradio/ctrlport/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -38,7 +38,7 @@
</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;'>- GR_PYTHON_INSTALL(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- FILES
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PROGRAMS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${CMAKE_CURRENT_SOURCE_DIR}/gr-perf-monitorx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${CMAKE_CURRENT_SOURCE_DIR}/gr-ctrlport-monitor
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DESTINATION ${GR_RUNTIME_DIR}
</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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 7f564ef..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gnuradio/files/patch-fix-mp.next.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,42 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gnuradio-runtime/lib/block.cc.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gnuradio-runtime/lib/block.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -194,13 +194,16 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- block::set_relative_rate(uint64_t interpolation, uint64_t decimation)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ mpz_class interp, decim;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (interpolation < 1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- throw std::invalid_argument("block::set_relative_rate: interpolation rate cannot be 0");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (decimation < 1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- throw std::invalid_argument("block::set_relative_rate: decimation rate cannot be 0");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- d_mp_relative_rate = mpq_class(interpolation, decimation);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ mpz_import(interp.get_mpz_t(), 1, 1, sizeof(interpolation), 0, 0, &interpolation);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ mpz_import(decim.get_mpz_t(), 1, 1, sizeof(decimation), 0, 0, &decimation);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ d_mp_relative_rate = mpq_class (interp, decim);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- d_mp_relative_rate.canonicalize();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- d_relative_rate = d_mp_relative_rate.get_d();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gnuradio-runtime/lib/block_executor.cc.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gnuradio-runtime/lib/block_executor.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -146,7 +146,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mpz_class offset;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for(t = rtags.begin(); t != rtags.end(); t++) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tag_t new_tag = *t;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- offset = new_tag.offset * mp_rrate + one_half;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 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:#ffe0e0;'>-+ offset *= mp_rrate + one_half;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- new_tag.offset = offset.get_ui();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for(int o = 0; o < d->noutputs(); o++)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- out_buf[o]->add_item_tag(new_tag);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -188,7 +189,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mpz_class offset;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for(t = rtags.begin(); t != rtags.end(); t++) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tag_t new_tag = *t;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- offset = new_tag.offset * mp_rrate + one_half;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 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:#ffe0e0;'>-+ offset *= mp_rrate + one_half;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- new_tag.offset = offset.get_ui();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- out_buf->add_item_tag(new_tag);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 50a24a4..0000000
</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;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -139,7 +139,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IF(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SET(CMAKE_CXX_STANDARD 11)
</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;'>- SET(CMAKE_CXX_STANDARD 11)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ELSEIF(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SET(CMAKE_CXX_STANDARD 11)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -149,7 +149,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IF(CMAKE_C_COMPILER_ID STREQUAL "GNU")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SET(CMAKE_C_STANDARD 11)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ELSEIF(CMAKE_C_COMPILER_ID STREQUAL "Clang")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ELSEIF(CMAKE_C_COMPILER_ID MATCHES "Clang")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SET(CMAKE_C_STANDARD 11)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ELSEIF(CMAKE_C_COMPILER_ID STREQUAL "MSVC")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SET(CMAKE_C_STANDARD 11)
</span></pre><pre style='margin:0'>
</pre>