<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/ed545bb6beb385c2c43193074fea5dca35b3e314">https://github.com/macports/macports-ports/commit/ed545bb6beb385c2c43193074fea5dca35b3e314</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 ed545bb gnuradio-next: add critical patch and tweak another; rev bump
</span>ed545bb is described below
<span style='display:block; white-space:pre;color:#808000;'>commit ed545bb6beb385c2c43193074fea5dca35b3e314
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Fri Aug 16 16:05:18 2019 -0400
<span style='display:block; white-space:pre;color:#404040;'> gnuradio-next: add critical patch and tweak another; rev bump
</span>---
science/gnuradio/Portfile | 7 +++-
...h-fix-GNURadioControlPortClient-usage.next.diff | 48 ++++++++++++++++++++++
.../patch-fix-pycallback_object-string.next.diff | 15 +++++++
3 files changed, 69 insertions(+), 1 deletion(-)
<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 1293221..3b6dda7 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;'>@@ -82,7 +82,7 @@ subport gnuradio-next {
</span> checksums rmd160 c8b689116c8ecc9a596641d94cac05046e489380 \
sha256 c85080a1713586467574ab0968b5bc802cc34f23027f0f492a15ab3048ed6315 \
size 3368359
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span>
# set the version override string
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -205,6 +205,11 @@ if {${subport} eq "gnuradio"} {
</span> patchfiles-append \
patch-fix-GNURadioControlPortClient-usage.next.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # temporary patch to fix pycallback_object string setting
</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-pycallback_object-string.next.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> }
# override githib PortGroup homepage setting
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gnuradio/files/patch-fix-GNURadioControlPortClient-usage.next.diff b/science/gnuradio/files/patch-fix-GNURadioControlPortClient-usage.next.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 0cb8772..97c8d22 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gnuradio/files/patch-fix-GNURadioControlPortClient-usage.next.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gnuradio/files/patch-fix-GNURadioControlPortClient-usage.next.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -95,3 +95,51 @@
</span> radio = radiosys.client
# Get all exported knobs
<span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gr-blocks/examples/ctrlport/simple_copy_controller.py.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gr-blocks/examples/ctrlport/simple_copy_controller.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -13,8 +13,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hostname = args[1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ portnum = int(args[2])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ msg = args[3].lower()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-argv = [None, hostname, portnum]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-radiosys = GNURadioControlPortClient(argv=argv, rpcmethod='thrift')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++radiosys = GNURadioControlPortClient(hostname, portnum, 'thrift')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ radio = radiosys.client
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(msg == 'true'):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gr-blocks/examples/ctrlport/usrp_sink_controller.py.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gr-blocks/examples/ctrlport/usrp_sink_controller.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -30,8 +30,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ val = pmt.from_double(float(val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-argv = [None, args.host, args.port]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-radiosys = GNURadioControlPortClient(argv=argv, rpcmethod='thrift')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++radiosys = GNURadioControlPortClient(args.host, args.port, 'thrift')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ radio = radiosys.client
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ radio.postMessage(args.alias, port, pmt.cons(pmt.intern(cmd), val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gr-blocks/examples/ctrlport/usrp_source_controller.py.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gr-blocks/examples/ctrlport/usrp_source_controller.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -30,8 +30,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ val = pmt.from_double(float(val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-argv = [None, args.host, args.port]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-radiosys = GNURadioControlPortClient(argv=argv, rpcmethod='thrift')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++radiosys = GNURadioControlPortClient(args.host, args.port, 'thrift')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ radio = radiosys.client
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ radio.postMessage(args.alias, port, pmt.cons(pmt.intern(cmd), val))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gr-dtv/examples/atsc_ctrlport_monitor.py.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gr-dtv/examples/atsc_ctrlport_monitor.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -45,8 +45,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ class atsc_ctrlport_monitor(object):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def __init__(self, host, port):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- argv = [None, host, port]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- radiosys = GNURadioControlPortClient(argv=argv, rpcmethod='thrift')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ radiosys = GNURadioControlPortClient(host, port, 'thrift')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ self.radio = radiosys.client
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ print(self.radio)
</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-pycallback_object-string.next.diff b/science/gnuradio/files/patch-fix-pycallback_object-string.next.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..65cd280
</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-pycallback_object-string.next.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gnuradio-runtime/include/gnuradio/pycallback_object.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gnuradio-runtime/include/gnuradio/pycallback_object.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -161,7 +161,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ template <>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ std::string pycallback_object<std::string>::pyCast(PyObject* obj)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if PY_MAJOR_VERSION >= 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return std::string(PyUnicode_AsUTF8(obj));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return std::string(PyString_AsString(obj));
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ template <>
</span></pre><pre style='margin:0'>
</pre>