<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/052534791598566b401a68a0a361705544862a01">https://github.com/macports/macports-ports/commit/052534791598566b401a68a0a361705544862a01</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 0525347 gnuradio*: temporary patches to fix logging and OS X audio.
</span>0525347 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 052534791598566b401a68a0a361705544862a01
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Tue May 9 11:59:36 2017 -0400
<span style='display:block; white-space:pre;color:#404040;'> gnuradio*: temporary patches to fix logging and OS X audio.
</span>---
science/gnuradio/Portfile | 20 +++++-
.../gnuradio/files/patch-gr-audio_fix_debug.diff | 84 ++++++++++++++++++++++
science/gnuradio/files/patch-logging_macros.diff | 79 ++++++++++++++++++++
3 files changed, 181 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 10e7d88..f54b006 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;'>@@ -25,7 +25,7 @@ dist_subdir gnuradio
</span> if {${subport} eq ${name}} {
github.setup gnuradio gnuradio 3.7.11 v
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 2
</span> checksums \
rmd160 7c361e19ccacd78f8a1e947b3307f8665d0bc0d2 \
sha256 6f796788606eda4a6b947c627a22f00575c6026464b95e05f897bdafd9a1a4fa
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,6 +56,7 @@ subport gnuradio-devel {
</span>
github.setup gnuradio gnuradio ce64630d5ecb1186c6e857e84a51b831f5b86adf
version 20170501
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 2
</span> checksums \
rmd160 bf96ea2b5ee739c17154d8f63c30022c0ff2d121 \
sha256 ce25d7074b9ee2e7f73efff7a3bfd2b77685c66d689e2b29cdb9e662b5c5b62f
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -76,7 +77,7 @@ subport gnuradio-next {
</span>
github.setup gnuradio gnuradio 68eb2afc2128b2fe942a6be48c903dea6b4b4489
version 20160816
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 5
</span> checksums \
rmd160 cb297ba374c6af5c7fded74a259333e2e171e8eb \
sha256 6c6353f19e5dd4c54edf99a26fef778ce440e10270e498191c13732b02e61d7f
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -117,6 +118,11 @@ if {${subport} eq "gnuradio"} {
</span> patchfiles-append \
patch-gr-fec_include_gnuradio_fec_polar_decoder_common.h.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # temporary patch to fix logging macros to work more robustly with
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # out-of-tree modules.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-logging_macros.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> } elseif {${subport} eq "gnuradio-devel"} {
# patches for devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -128,6 +134,11 @@ if {${subport} eq "gnuradio"} {
</span>
patchfiles-append patch-CMakeLists.txt.devel.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # temporary patch to fix logging macros to work more robustly with
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # out-of-tree modules.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-logging_macros.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> } else {
# patches for next
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -230,6 +241,11 @@ configure.args-append \
</span> configure.args-append \
-DCMAKE_CXX_STANDARD=11
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# debug for OSX Audio
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-gr-audio_fix_debug.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#configure.cxxflags-append -D_OSX_AU_DEBUG_=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-destroot {
# fix residual cmake module install location when
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gnuradio/files/patch-gr-audio_fix_debug.diff b/science/gnuradio/files/patch-gr-audio_fix_debug.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..81c6cfc
</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-gr-audio_fix_debug.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,84 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gr-audio/include/gnuradio/audio/osx_impl.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gr-audio/include/gnuradio/audio/osx_impl.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -33,10 +33,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <AudioToolbox/AudioToolbox.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <AudioUnit/AudioUnit.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-namespace gr {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-namespace audio {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-namespace osx {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Check the version of MacOSX being used
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef __APPLE_CC__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <AvailabilityMacros.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -50,15 +46,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // helper function to print an ASBD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern std::ostream& GR_AUDIO_API
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++std::ostream& GR_AUDIO_API
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ operator<<
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (std::ostream& s,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const AudioStreamBasicDescription& asbd);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++namespace gr {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++namespace audio {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++namespace osx {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // returns the number of channels for the provided AudioDeviceID,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // input and/or output depending on if the pointer is valid.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern void GR_AUDIO_API
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void GR_AUDIO_API
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ get_num_channels_for_audio_device_id
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (AudioDeviceID ad_id,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ UInt32* n_input,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -70,7 +70,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // matching names. If the device name is empty, then match all
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // input or output devices.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern void GR_AUDIO_API
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void GR_AUDIO_API
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_audio_devices
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (const std::string& device_name,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool is_input,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gr-audio/lib/osx/osx_common.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gr-audio/lib/osx/osx_common.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -29,8 +29,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace audio {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace osx {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef _OSX_AU_DEBUG_
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define _OSX_AU_DEBUG_ 0
</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;'>++#ifndef _OSX_AU_DEBUG_RENDER_
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define _OSX_AU_DEBUG_RENDER_ 0
</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;'>+ #define check_error_and_throw(err,what,throw_str) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(err) { \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gr-audio/lib/osx/osx_impl.cc.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gr-audio/lib/osx/osx_impl.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -33,10 +33,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <locale>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdexcept>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-namespace gr {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-namespace audio {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-namespace osx {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ std::ostream&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ operator<<
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (std::ostream& s,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -70,6 +66,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return(s);
</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;'>++namespace gr {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++namespace audio {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++namespace osx {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static UInt32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _get_num_channels
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (AudioDeviceID ad_id,
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gnuradio/files/patch-logging_macros.diff b/science/gnuradio/files/patch-logging_macros.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..ae02501
</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-logging_macros.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,79 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- config.h.in.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ config.h.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -36,11 +36,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef GR_RPCSERVER_THRIFT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #cmakedefine GR_RPCSERVER_THRIFT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef ENABLE_GR_LOG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#cmakedefine ENABLE_GR_LOG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef HAVE_LOG4CPP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#cmakedefine HAVE_LOG4CPP
</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;'>+ #endif /* GNURADIO_CONFIG_H */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gnuradio-runtime/include/gnuradio/logger.h.in.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gnuradio-runtime/include/gnuradio/logger.h.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -35,13 +35,60 @@
</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;'>+-#ifndef ENABLE_GR_LOG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// handle current status of GR_LOG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef EXT_ENABLE_GR_LOG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#undef EXT_ENABLE_GR_LOG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef ENABLE_GR_LOG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define EXT_ENABLE_GR_LOG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#undef ENABLE_GR_LOG
</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;'>++// did GR enable LOG?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #cmakedefine ENABLE_GR_LOG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// if GR does not provide logging and the current module is requesting
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// it, disable it.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(EXT_ENABLE_GR_LOG) && !defined(ENABLE_GR_LOG)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#warning "Logging was requested but is not enabled in GNU Radio, so disabling."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#undef EXT_ENABLE_GR_LOG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifndef HAVE_LOG4CPP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// if GR provides logging but the current module is not requesting it,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// disable it.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(EXT_ENABLE_GR_LOG) && defined(ENABLE_GR_LOG)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#undef ENABLE_GR_LOG
</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;'>++// the other 2 cases work; no need to check them!
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// handle current status of LOG4CPP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef EXT_HAVE_LOG4CPP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#undef EXT_HAVE_LOG4CPP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef HAVE_LOG4CPP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define EXT_HAVE_LOG4CPP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#undef HAVE_LOG4CPP
</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;'>++// did GR use log4cpp?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #cmakedefine HAVE_LOG4CPP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// if GR does not use log4cpp and the current module is requesting it,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// disable it & print a warning.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(EXT_HAVE_LOG4CPP) && !defined(HAVE_LOG4CPP)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#warning "Log4Cpp use was requested but was not in GNU Radio, so disabling."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#undef EXT_HAVE_LOG4CPP
</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 GR provides for using log4cpp but the current module is not
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// requesting it, disable it quietly.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(EXT_HAVE_LOG4CPP) && defined(HAVE_LOG4CPP)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#undef HAVE_LOG4CPP
</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;'>++// the other 2 cases work; no need to check them!
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef _MSC_VER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef unsigned short mode_t;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span></pre><pre style='margin:0'>
</pre>