<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/5ef8f1506ea2059f836f410d824f469db8d8a6b2">https://github.com/macports/macports-ports/commit/5ef8f1506ea2059f836f410d824f469db8d8a6b2</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 5ef8f15 libuv: update release to 1.20.0 and devel to 00d13c5b (20180402).
</span>5ef8f15 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 5ef8f1506ea2059f836f410d824f469db8d8a6b2
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Mon Apr 2 15:11:43 2018 -0400
<span style='display:block; white-space:pre;color:#404040;'> libuv: update release to 1.20.0 and devel to 00d13c5b (20180402).
</span>---
devel/libuv/Portfile | 17 +++--
science/gnuradio/files/patch-CMakeLists.txt.diff | 80 --------------------
.../gnuradio/files/patch-add-CMakeOverloads.diff | 88 ----------------------
.../patch-cmake_Modules_FindCppUnit.cmake.diff | 12 ---
.../gnuradio/files/patch-gr-audio_fix_debug.diff | 84 ---------------------
.../files/patch-gr-audio_lib_osx_osx_impl.cc.diff | 11 ---
...nclude_gnuradio_fec_polar_decoder_common.h.diff | 22 ------
science/gnuradio/files/patch-logging_macros.diff | 79 -------------------
science/gnuradio/files/patch-volk-devel-API.diff | 11 ---
9 files changed, 9 insertions(+), 395 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libuv/Portfile b/devel/libuv/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0b2836a..1d7d230 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libuv/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libuv/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,9 +18,10 @@ long_description \
</span>
if {${subport} eq ${name}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup libuv libuv 1.19.2 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 f33f644a0f47ad02ad0a295cf76a912a564f9b04 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 fcc84f7512fb30cafe98f7a20a8be794b0b4eafc393f4ffe1816dad1222d2a0e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup libuv libuv 1.20.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 2ba3740c0998dc192f99412b203ce4a77773beef \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 2a210273f7ea1d255f069a53296e57921c0db0ab5ba0ec0705c33f739514823d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1180332
</span>
conflicts libuv-devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,11 +29,11 @@ if {${subport} eq ${name}} {
</span>
subport libuv-devel {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup libuv libuv 67a00e27c17ad742081b07ca7f59edde46c79786
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20180329
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 8104aab6376bad97d9aa445410de1bd99a13abab \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 8ddd41a2bfa4605bdbc1f5aa7e1073f9f82261f8c78ec25323031b52821b0744 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1179157
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup libuv libuv 00d13c5b9f68c06a241461fd5f0f94776b9d438f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20180402
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 bfd5638199989f0d556c35a695c236afb5dc68ba \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 50207a03b1ad84cea35dd6385b10f2d340b9a6fbd882236dd13c4ebb20605765 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1180355
</span>
long_description ${long_description} \
This port is kept up with the libuv GIT 'master' branch, is typically updated weekly to monthly.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gnuradio/files/patch-CMakeLists.txt.diff b/science/gnuradio/files/patch-CMakeLists.txt.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3db3d73..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gnuradio/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,80 +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;'>-@@ -56,29 +56,27 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O2")
</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;'>--# Set C/C++ standard for all targets
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# NOTE: Starting with cmake v3.1 this should be used:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# set(CMAKE_C_STANDARD 90)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# set(CMAKE_CXX_STANDARD 98)
</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_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98")
</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;'>-- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98")
</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_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ELSE()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- message(warning "C++ standard could not be set because compiler is not GNU, Clang or MSVC.")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ENDIF()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# Configure C++ standard if not externally specified
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# (will actually be set after CppUnit check below)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if(NOT CMAKE_CXX_STANDARD)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SET(CMAKE_CXX_STANDARD 98)
</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_C_COMPILER_ID STREQUAL "GNU")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
</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;'>-- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
</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_FLAGS "${CMAKE_C_FLAGS} -std=c11")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ELSE()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- message(warning "C standard could not be set because compiler is not GNU, Clang or MSVC.")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# Configure C standard if not externally specified
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if(NOT CMAKE_C_STANDARD)
</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 99)
</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;'>-+ SET(CMAKE_C_STANDARD 99)
</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><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ELSE()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # default
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SET(CMAKE_C_STANDARD 90)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ENDIF()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+IF(CMAKE_VERSION VERSION_LESS "3.1")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c${CMAKE_C_STANDARD}")
</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;'>- # Set cmake policies.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -306,6 +304,27 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CPPUNIT_FOUND
</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;'>-+# check if CppUnit version is 1.14.0 or greater; requires c++11 ...
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if(CPPUNIT_FOUND AND NOT "${CPPUNIT_VERSION}" VERSION_LESS "1.14.0")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ message(WARNING "\nWarning: CppUnit version is ${CPPUNIT_VERSION} which requires C++11 for building. Trying to set CMake internally to use C++11 ...")
</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;'>-+endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# set actual C++ standard to use, if cmake version is < 3.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if(CMAKE_VERSION VERSION_LESS "3.1")
</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_FLAGS "${CMAKE_CXX_FLAGS} -std=c++${CMAKE_CXX_STANDARD}")
</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;'>-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++${CMAKE_CXX_STANDARD}")
</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_FLAGS "${CMAKE_CXX_FLAGS} -std=c++${CMAKE_CXX_STANDARD}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ message(WARNING "\nC++ standard could not be set because compiler is not GNU, Clang or MSVC.")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ endif()
</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;'>- ########################################################################
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Add optional dlls specified in DLL_PATHS
</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-add-CMakeOverloads.diff b/science/gnuradio/files/patch-add-CMakeOverloads.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e41d824..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gnuradio/files/patch-add-CMakeOverloads.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,88 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.org
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -115,6 +115,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(EXPORT_FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file(WRITE ${EXPORT_FILE}) #blank the file (subdirs will append)
</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;'>-+# Incorporate CMake function/macros overloading.
</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;'>-+include(CMakeOverloads)
</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;'>- # Compiler specific setup
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ########################################################################
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ cmake/Modules/CMakeOverloads.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1,70 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# Copyright 2017 Free Software Foundation, Inc.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# This file is part of GNU Radio
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# GNU Radio is free software; you can redistribute it and/or modify
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# it under the terms of the GNU General Public License as published by
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# the Free Software Foundation; either version 3, or (at your option)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# any later version.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# GNU Radio is distributed in the hope that it will be useful,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# GNU General Public License for more details.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# You should have received a copy of the GNU General Public License
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# along with GNU Radio; see the file COPYING. If not, write to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# the Free Software Foundation, Inc., 51 Franklin Street,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# Boston, MA 02110-1301, USA.
</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;'>-+# This file contains functions that override those provided by CMake.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# We do this to allow for more generic use of these functions than as
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# provided by CMake.
</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;'>-+if(DEFINED __INCLUDED_CMAKE_OVERLOADS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+set(__INCLUDED_CMAKE_OVERLOADS TRUE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# overload INCLUDE_DIRECTORIES to be a little smarter
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# NOTE: moving all include directories to either BEFORE (internal to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# source or build) or AFTER (external to source or build) will work in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# general. The primary time it could fail is when include ordering is
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# required to find a specific version of a header when multiple of the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# same name are available in the various include directories. This
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# situation seems like it's unlikely, so we ignore it here.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+macro(INCLUDE_DIRECTORIES)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # for each provided include directory ...
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ foreach(inc_dir ${ARGN})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # is this dir the literal string "BEFORE" or "AFTER"?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ string(FIND ${inc_dir} BEFORE IS_BEFORE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ string(FIND ${inc_dir} AFTER IS_AFTER)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(${IS_BEFORE} EQUAL 0 OR ${IS_AFTER} EQUAL 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # yes: ignore it
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ continue()
</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;'>-+ # get absolute path of this include directory
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ get_filename_component(inc_dir_abs ${inc_dir} ABSOLUTE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # is this include directory located within the SOURCE or BUILD?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ string(FIND ${inc_dir_abs} ${CMAKE_SOURCE_DIR} IS_IN_SOURCE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ string(FIND ${inc_dir_abs} ${CMAKE_BINARY_DIR} IS_IN_BINARY)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(${IS_IN_SOURCE} EQUAL 0 OR ${IS_IN_BINARY} EQUAL 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # yes: local SOURCE or BINARY; internal.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # call the overloaded INCLUDE_DIRECTORIES,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # prepending this internal directory.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _include_directories(BEFORE ${inc_dir_abs})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # no: not SOURCE or BUILD; must be external.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # call the overloaded INCLUDE_DIRECTORIES,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # appending this external directory.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _include_directories(AFTER ${inc_dir_abs})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ endforeach()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+endmacro(INCLUDE_DIRECTORIES)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gnuradio/files/patch-cmake_Modules_FindCppUnit.cmake.diff b/science/gnuradio/files/patch-cmake_Modules_FindCppUnit.cmake.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 67c0324..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gnuradio/files/patch-cmake_Modules_FindCppUnit.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- cmake/Modules/FindCppUnit.cmake.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ cmake/Modules/FindCppUnit.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -37,3 +37,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INCLUDE(FindPackageHandleStandardArgs)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FIND_PACKAGE_HANDLE_STANDARD_ARGS(CPPUNIT DEFAULT_MSG CPPUNIT_LIBRARIES CPPUNIT_INCLUDE_DIRS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MARK_AS_ADVANCED(CPPUNIT_LIBRARIES CPPUNIT_INCLUDE_DIRS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# set version to be useable by calling script
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+IF(CPPUNIT_FOUND)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(CPPUNIT_VERSION ${PC_CPPUNIT_VERSION} CACHE INTERNAL "CppUnit Version" FORCE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ENDIF()
</span><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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 81c6cfc..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gnuradio/files/patch-gr-audio_fix_debug.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,84 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gr-audio/include/gnuradio/audio/osx_impl.h.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gr-audio/include/gnuradio/audio/osx_impl.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -33,10 +33,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <AudioToolbox/AudioToolbox.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <AudioUnit/AudioUnit.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--namespace gr {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--namespace audio {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--namespace osx {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Check the version of MacOSX being used
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef __APPLE_CC__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <AvailabilityMacros.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -50,15 +46,19 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // helper function to print an ASBD
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--extern std::ostream& GR_AUDIO_API
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+std::ostream& GR_AUDIO_API
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- operator<<
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (std::ostream& s,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const AudioStreamBasicDescription& asbd);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+namespace gr {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+namespace audio {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+namespace osx {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // returns the number of channels for the provided AudioDeviceID,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // input and/or output depending on if the pointer is valid.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--extern void GR_AUDIO_API
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+void GR_AUDIO_API
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- get_num_channels_for_audio_device_id
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (AudioDeviceID ad_id,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- UInt32* n_input,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -70,7 +70,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // matching names. If the device name is empty, then match all
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // input or output devices.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--extern void GR_AUDIO_API
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+void GR_AUDIO_API
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- find_audio_devices
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (const std::string& device_name,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool is_input,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gr-audio/lib/osx/osx_common.h.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gr-audio/lib/osx/osx_common.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -29,8 +29,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- namespace audio {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- namespace osx {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef _OSX_AU_DEBUG_
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define _OSX_AU_DEBUG_ 0
</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;'>-+#ifndef _OSX_AU_DEBUG_RENDER_
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define _OSX_AU_DEBUG_RENDER_ 0
</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;'>- #define check_error_and_throw(err,what,throw_str) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(err) { \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gr-audio/lib/osx/osx_impl.cc.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gr-audio/lib/osx/osx_impl.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -33,10 +33,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <locale>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdexcept>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--namespace gr {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--namespace audio {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--namespace osx {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- std::ostream&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- operator<<
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (std::ostream& s,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -70,6 +66,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return(s);
</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;'>-+namespace gr {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+namespace audio {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+namespace osx {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static UInt32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _get_num_channels
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (AudioDeviceID ad_id,
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gnuradio/files/patch-gr-audio_lib_osx_osx_impl.cc.diff b/science/gnuradio/files/patch-gr-audio_lib_osx_osx_impl.cc.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 64958d0..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gnuradio/files/patch-gr-audio_lib_osx_osx_impl.cc.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;'>---- gr-audio/lib/osx/osx_impl.cc.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gr-audio/lib/osx/osx_impl.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -43,7 +43,7 @@ operator<<
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const AudioStreamBasicDescription& asbd)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char format_id[sizeof(asbd.mFormatID)+1];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- memcpy((void*)(&asbd.mFormatID), format_id, sizeof(asbd.mFormatID));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ memcpy(format_id, (void*)(&asbd.mFormatID), sizeof(asbd.mFormatID));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- format_id[sizeof(asbd.mFormatID)] = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- s << " Sample Rate : " << asbd.mSampleRate << std::endl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- s << " Format ID : " << format_id << std::endl;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gnuradio/files/patch-gr-fec_include_gnuradio_fec_polar_decoder_common.h.diff b/science/gnuradio/files/patch-gr-fec_include_gnuradio_fec_polar_decoder_common.h.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index c8a8604..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gnuradio/files/patch-gr-fec_include_gnuradio_fec_polar_decoder_common.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,22 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gr-fec/include/gnuradio/fec/polar_decoder_common.h.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gr-fec/include/gnuradio/fec/polar_decoder_common.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -28,10 +28,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <gnuradio/fec/generic_decoder.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <gnuradio/fec/polar_common.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef BOOST_CONSTEXPR_OR_CONST
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define BOOST_CONSTEXPR_OR_CONST const
</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;'>- namespace gr {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- namespace fec {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- namespace code {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -68,7 +64,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool set_frame_size(unsigned int frame_size){return false;};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- private:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- static BOOST_CONSTEXPR_OR_CONST float D_LLR_FACTOR;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ static const float D_LLR_FACTOR;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unsigned int d_frozen_bit_counter;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- protected:
</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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ae02501..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gnuradio/files/patch-logging_macros.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,79 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- config.h.in.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ config.h.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -36,11 +36,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifndef GR_RPCSERVER_THRIFT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #cmakedefine GR_RPCSERVER_THRIFT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef ENABLE_GR_LOG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#cmakedefine ENABLE_GR_LOG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef HAVE_LOG4CPP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#cmakedefine HAVE_LOG4CPP
</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;'>- #endif /* GNURADIO_CONFIG_H */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gnuradio-runtime/include/gnuradio/logger.h.in.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gnuradio-runtime/include/gnuradio/logger.h.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -35,13 +35,60 @@
</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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef ENABLE_GR_LOG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// handle current status of GR_LOG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef EXT_ENABLE_GR_LOG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#undef EXT_ENABLE_GR_LOG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef ENABLE_GR_LOG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define EXT_ENABLE_GR_LOG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#undef ENABLE_GR_LOG
</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;'>-+// did GR enable LOG?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #cmakedefine ENABLE_GR_LOG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// if GR does not provide logging and the current module is requesting
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// it, disable it.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(EXT_ENABLE_GR_LOG) && !defined(ENABLE_GR_LOG)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#warning "Logging was requested but is not enabled in GNU Radio, so disabling."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#undef EXT_ENABLE_GR_LOG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef HAVE_LOG4CPP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// if GR provides logging but the current module is not requesting it,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// disable it.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if !defined(EXT_ENABLE_GR_LOG) && defined(ENABLE_GR_LOG)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#undef ENABLE_GR_LOG
</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;'>-+// the other 2 cases work; no need to check them!
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// handle current status of LOG4CPP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef EXT_HAVE_LOG4CPP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#undef EXT_HAVE_LOG4CPP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef HAVE_LOG4CPP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define EXT_HAVE_LOG4CPP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#undef HAVE_LOG4CPP
</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;'>-+// did GR use log4cpp?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #cmakedefine HAVE_LOG4CPP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// if GR does not use log4cpp and the current module is requesting it,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// disable it & print a warning.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(EXT_HAVE_LOG4CPP) && !defined(HAVE_LOG4CPP)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#warning "Log4Cpp use was requested but was not in GNU Radio, so disabling."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#undef EXT_HAVE_LOG4CPP
</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 GR provides for using log4cpp but the current module is not
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// requesting it, disable it quietly.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if !defined(EXT_HAVE_LOG4CPP) && defined(HAVE_LOG4CPP)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#undef HAVE_LOG4CPP
</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;'>-+// the other 2 cases work; no need to check them!
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef _MSC_VER
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typedef unsigned short mode_t;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gnuradio/files/patch-volk-devel-API.diff b/science/gnuradio/files/patch-volk-devel-API.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 38bf636..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gnuradio/files/patch-volk-devel-API.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;'>---- gr-fec/lib/polar_decoder_common.cc.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gr-fec/lib/polar_decoder_common.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -125,7 +125,7 @@ namespace gr {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- polar_decoder_common::butterfly_volk(float* llrs, unsigned char* u, const int stage,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const int u_num, const int row)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- volk_32f_8u_polarbutterfly_32f(llrs, u, block_size(), block_power(), stage, u_num, row);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ volk_32f_8u_polarbutterfly_32f(llrs, u, block_power(), stage, u_num, row);
</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;'>-
</span></pre><pre style='margin:0'>
</pre>