<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/655fab28dafc21bbde70c3d5ff153e36bbfc412f">https://github.com/macports/macports-ports/commit/655fab28dafc21bbde70c3d5ff153e36bbfc412f</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 655fab2 gnuradio-devel: update and add patches and rev-bump for changes
</span>655fab2 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 655fab28dafc21bbde70c3d5ff153e36bbfc412f
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Wed Nov 28 14:20:35 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> gnuradio-devel: update and add patches and rev-bump for changes
</span>---
science/gnuradio/Portfile | 11 ++
.../files/patch-fix-FindLog4cpp.devel.diff | 13 +++
science/gnuradio/files/patch-fix-mp.devel.diff | 4 +-
.../files/patch-fix-rpc-unused-vars.devel.diff | 120 +++++++++++++++++++++
4 files changed, 146 insertions(+), 2 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 8470660..f7b85f7 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;'>@@ -54,6 +54,7 @@ subport gnuradio-devel {
</span>
github.setup gnuradio gnuradio 896d1c9da31963ecf5b0d90942c2af51ca998a69
version 20180824
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span> checksums rmd160 8ad7fccef7e21ea96356253432f5f13ad61660ed \
sha256 51080fad6f776f8aec1a6c557320c6c64b4c3c3fde3615ca4d43802de65f324f \
size 4425148
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -158,6 +159,16 @@ if {${subport} eq "gnuradio"} {
</span> patchfiles-append \
patch-fix-ctrlport-python-app-install-location.devel.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # patch to fix FindLog2cpp.cmake script to correct cache LOG4CPP_FOUND
</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-FindLog4cpp.devel.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # patch to fix unused RPC variables
</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-rpc-unused-vars.devel.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> } else {
# patches for next
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gnuradio/files/patch-fix-FindLog4cpp.devel.diff b/science/gnuradio/files/patch-fix-FindLog4cpp.devel.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..a7220dd
</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-FindLog4cpp.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cmake/Modules/FindLog4cpp.cmake.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cmake/Modules/FindLog4cpp.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23,9 +23,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PATHS /usr/lib /usr/local/lib /opt/local/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (LOG4CPP_INCLUDE_DIR AND LOG4CPP_LIBRARY)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(LOG4CPP_FOUND TRUE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(LOG4CPP_FOUND TRUE CACHE INTERNAL "" FORCE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(LOG4CPP_LIBRARIES ${LOG4CPP_LIBRARY} CACHE INTERNAL "" FORCE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(LOG4CPP_INCLUDE_DIRS ${LOG4CPP_INCLUDE_DIR} CACHE INTERNAL "" FORCE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else ()
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gnuradio/files/patch-fix-mp.devel.diff b/science/gnuradio/files/patch-fix-mp.devel.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 7f564ef..bdf8658 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gnuradio/files/patch-fix-mp.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gnuradio/files/patch-fix-mp.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,7 +26,7 @@
</span> tag_t new_tag = *t;
- offset = new_tag.offset * mp_rrate + one_half;
+ mpz_import(offset.get_mpz_t(), 1, 1, sizeof(new_tag.offset), 0, 0, &new_tag.offset);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ offset *= mp_rrate + one_half;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ offset = offset * mp_rrate + one_half;
</span> new_tag.offset = offset.get_ui();
for(int o = 0; o < d->noutputs(); o++)
out_buf[o]->add_item_tag(new_tag);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,7 +36,7 @@
</span> tag_t new_tag = *t;
- offset = new_tag.offset * mp_rrate + one_half;
+ mpz_import(offset.get_mpz_t(), 1, 1, sizeof(new_tag.offset), 0, 0, &new_tag.offset);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ offset *= mp_rrate + one_half;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ offset = offset * mp_rrate + one_half;
</span> new_tag.offset = offset.get_ui();
out_buf->add_item_tag(new_tag);
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gnuradio/files/patch-fix-rpc-unused-vars.devel.diff b/science/gnuradio/files/patch-fix-rpc-unused-vars.devel.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..e1c26ba0
</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-rpc-unused-vars.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,120 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gnuradio-runtime/include/gnuradio/rpcmanager.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gnuradio-runtime/include/gnuradio/rpcmanager.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -53,7 +53,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static bool make_aggregator;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static bool booter_registered;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static bool aggregator_registered;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- static void rpcserver_booter_base_sptr_dest(rpcserver_booter_base* b) {;}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ static void rpcserver_booter_base_sptr_dest(rpcserver_booter_base* b) {(void) b;}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static std::auto_ptr<rpcserver_booter_base> boot;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static std::auto_ptr<rpcserver_booter_aggregator> aggregator;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gnuradio-runtime/include/gnuradio/rpcregisterhelpers.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gnuradio-runtime/include/gnuradio/rpcregisterhelpers.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -56,6 +56,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ~rpcextractor_base() {;}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void post(pmt::pmt_t which_port, pmt::pmt_t msg) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (void) which_port;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (void) msg;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ throw std::runtime_error("rpcextractor_base: no post defined for this data type.\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -74,6 +76,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ~rpcextractor_base() {;}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void post(pmt::pmt_t which_port, pmt::pmt_t msg) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (void) which_port;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (void) msg;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ throw std::runtime_error("rpcextractor_base: no post defined for this data type.\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -204,6 +208,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void post(pmt::pmt_t which_port, pmt::pmt_t msg)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (void) which_port;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (void) msg;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (rpcextractor_base<T,void>::_source->*rpcextractor_base<T,void>::_func)();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -221,6 +227,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void post(pmt::pmt_t which_port, pmt::pmt_t msg)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (void) which_port;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (rpcextractor_base<T,char>::_source->*rpcextractor_base<T,char>::_func)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (static_cast<char>(pmt::to_long(msg)));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -239,6 +246,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void post(pmt::pmt_t which_port, pmt::pmt_t msg)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (void) which_port;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (rpcextractor_base<T,short>::_source->*rpcextractor_base<T,short>::_func)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (static_cast<short>(pmt::to_long(msg)));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -257,6 +265,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void post(pmt::pmt_t which_port, pmt::pmt_t msg)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (void) which_port;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (rpcextractor_base<T,double>::_source->*rpcextractor_base<T,double>::_func)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (pmt::to_double(msg));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -275,6 +284,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void post(pmt::pmt_t which_port, pmt::pmt_t msg)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (void) which_port;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (rpcextractor_base<T,float>::_source->*rpcextractor_base<T,float>::_func)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (pmt::to_double(msg));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -293,6 +303,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void post(pmt::pmt_t which_port, pmt::pmt_t msg)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (void) which_port;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (rpcextractor_base<T,long>::_source->*rpcextractor_base<T,long>::_func)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (pmt::to_long(msg));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -311,6 +322,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void post(pmt::pmt_t which_port, pmt::pmt_t msg)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (void) which_port;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (rpcextractor_base<T,int>::_source->*rpcextractor_base<T,int>::_func)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (pmt::to_long(msg));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -329,6 +341,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void post(pmt::pmt_t which_port, pmt::pmt_t msg)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (void) which_port;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (rpcextractor_base<T,bool>::_source->*rpcextractor_base<T,bool>::_func)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (pmt::to_bool(msg));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -348,6 +361,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void post(pmt::pmt_t which_port, pmt::pmt_t msg)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (void) which_port;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ std::complex<float> k = static_cast<std::complex<float> >(pmt::to_complex(msg));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (rpcextractor_base<T,std::complex<float> >::
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _source->*rpcextractor_base<T,std::complex<float> >::_func)(k);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -368,6 +382,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void post(pmt::pmt_t which_port, pmt::pmt_t msg)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (void) which_port;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (rpcextractor_base<T,std::complex<double> >::
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _source->*rpcextractor_base<T,std::complex<double> >::_func)(pmt::to_complex(msg));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -387,6 +402,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void post(pmt::pmt_t which_port, pmt::pmt_t msg)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (void) which_port;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (rpcextractor_base<T,std::string>::
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _source->*rpcextractor_base<T,std::string>::_func)(pmt::symbol_to_string(msg));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span></pre><pre style='margin:0'>
</pre>