Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 15 Mar 2019 23:57:03 +0000 (UTC)
From:      Diane Bruce <db@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r495839 - in head/comms/gnuradio: . files
Message-ID:  <201903152357.x2FNv35f067670@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: db
Date: Fri Mar 15 23:57:02 2019
New Revision: 495839
URL: https://svnweb.freebsd.org/changeset/ports/495839

Log:
  Update to 3.8 git version to move from Qt4 to Qt5
  
  ## unreleased
  
  ### Fixed
  #### Project Scope
  - `boost::posix_time::[milli]second` takes integer numbers, and we now at least cast the floats to integers, as Boost 1.67 forced us to realize we're (incorrectly) using floating point her
  - CMake: using regex to match compiler against "Clang" now enables correct build on OS X
  #### GRC
  - Fixed GRC bug which broke WX and Qt (by altering the template code), in multiple (less than awesome) steps
  #### gr-analog
  - `fmdet_cf`'s derivative coefficients were wrong.
  #### gr-blocks
  - `float_array_to_int`: int32 limits were wrongly hardcoded.
  - Fixed the undefined behaviour happening in `float_to_complex` when accessing the second input_items element in the single-input case
  
  ### Added
  #### gr-analog
  - QA for complex cosine
  #### gr-utils
  - `gr_modtool` now with autocompletion candidates for `rm`
  
  ### Changed
  #### Project Scope
  - Removed cppunit from all unit tests, replaced by Boost
  - Removed the cppunit dependency

Added:
  head/comms/gnuradio/files/patch-cmake_Modules_FindQwt.cmake   (contents, props changed)
  head/comms/gnuradio/files/patch-cmake_Modules_GrPython.cmake   (contents, props changed)
  head/comms/gnuradio/files/patch-gr-vocoder_lib_gsm__fr__decode__ps__impl.h   (contents, props changed)
  head/comms/gnuradio/files/patch-gr-vocoder_lib_gsm__fr__encode__sp__impl.h   (contents, props changed)
Deleted:
  head/comms/gnuradio/files/patch-cmake_Modules_FindUSB.cmake
  head/comms/gnuradio/files/patch-cmake_Modules_GrMiscUtils.cmake
  head/comms/gnuradio/files/patch-gr-fcd_lib_CMakeLists.txt
  head/comms/gnuradio/files/patch-volk_CMakeLists.txt
Modified:
  head/comms/gnuradio/Makefile
  head/comms/gnuradio/distinfo
  head/comms/gnuradio/files/patch-CMakeLists.txt
  head/comms/gnuradio/files/patch-docs_doxygen_Doxyfile.in
  head/comms/gnuradio/pkg-descr
  head/comms/gnuradio/pkg-plist

Modified: head/comms/gnuradio/Makefile
==============================================================================
--- head/comms/gnuradio/Makefile	Fri Mar 15 23:36:49 2019	(r495838)
+++ head/comms/gnuradio/Makefile	Fri Mar 15 23:57:02 2019	(r495839)
@@ -1,26 +1,25 @@
 # $FreeBSD$
 
 PORTNAME=	gnuradio
-PORTVERSION=	3.7.13.4
-PORTREVISION=	4
+#MASTER_SITES=	http://gnuradio.org/releases/gnuradio/
+# Temporary git version
+DISTVERSION=	3.8.g20190309
 CATEGORIES=	comms astro hamradio
-MASTER_SITES=	http://gnuradio.org/releases/gnuradio/ \
-		LOCAL/db
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Amateur Radio Software defined radio
 
 LICENSE=	GPLv3
 
-DEPRECATED=		Qt4 has been EOL since december 2015
-EXPIRATION_DATE=	2019-03-15
-
 BROKEN_aarch64=		fails to compile: /usr/lib/clang/5.0.0/include/mmintrin.h:47:5: use of undeclared identifier '__builtin_ia32_emms'; did you mean '__builtin_isless'?
 BROKEN_armv6=		fails to compile: /usr/lib/clang/5.0.0/include/mmintrin.h:47:5: use of undeclared identifier '__builtin_ia32_emms'; did you mean '__builtin_isless'?
 BROKEN_armv7=		fails to compile: /usr/lib/clang/5.0.0/include/mmintrin.h:47:5: use of undeclared identifier '__builtin_ia32_emms'; did you mean '__builtin_isless'?
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \
+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/lxml:devel/py-lxml@${PY_FLAVOR} \
 		${PYNUMPY} \
+		${PYTHON_SITELIBDIR}/yaml/__init__.py:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_SITELIBDIR}/gi/__init__.py:devel/py-gobject3@${PY_FLAVOR} \
+		${PYTHON_SITELIBDIR}/cairo/__init__.py:graphics/py-cairo@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/ephem/__init__.py:astro/pyephem@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/mako/__init__.py:textproc/py-mako@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/six.py:devel/py-six@${PY_FLAVOR} \
@@ -31,11 +30,11 @@ BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-
 		sdl-config:devel/sdl12 \
 		swig3.0:devel/swig30 \
 		xdg-open:devel/xdg-utils
-LIB_DEPENDS=	libcppunit.so:devel/cppunit \
-		libcodec2.so:audio/codec2 \
+LIB_DEPENDS=	libcodec2.so:audio/codec2 \
 		libfftw3.so:math/fftw3 \
 		libfftw3f.so:math/fftw3-float \
-		libqwt.so:x11-toolkits/qwt5 \
+		libgmpxx.so:math/gmp \
+		libqwt6.so:x11-toolkits/qwt6 \
 		${PY_BOOST} \
 		liblog4cpp.so:devel/log4cpp \
 		libportaudio.so:audio/portaudio \
@@ -47,11 +46,17 @@ LIB_DEPENDS=	libcppunit.so:devel/cppunit \
 		liborc-0.4.so:devel/orc
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	gnuradio
+GH_PROJECT=	gnuradio volk:volk
+GH_TAGNAME=	a664001 d250816:volk
+
 # USES=compiler:c11 is necessary because base GCC fails:
 # volk/lib/volk_cpu.c: In function 'i_can_has_3dnow':
 # volk/lib/volk_cpu.c:62: error: can't find a register in class 'BREG' while reloading 'asm'
 # volk/lib/volk_cpu.c:62: error: 'asm' operand has impossible constraints
-USES=		cmake compiler:c11 fortran iconv perl5 pkgconfig pyqt:4 python:2.7 qt:4 shebangfix
+USES=		cmake compiler:c11 desktop-file-utils fortran gnome iconv \
+		perl5 pkgconfig pyqt:5 python qt:5 shared-mime-info shebangfix
 SHEBANG_FILES=	grc/scripts/freedesktop/grc_setup_freedesktop.in \
 		gnuradio-runtime/python/gnuradio/ctrlport/gr-ctrlport-monitor \
 		gnuradio-runtime/python/gnuradio/ctrlport/gr-perf-monitorx
@@ -65,19 +70,19 @@ CMAKE_ARGS+=	-DCMAKE_INSTALL_RPATH:STRING="${LOCALBASE
 		-DXMLTO_EXECUTABLE:STRING=minixmlto
 # for detailed debugging uncomment the next line
 #CMAKE_ARGS+=	--debug-output --trace
-MAJOR_SUB_VER=	${PORTVERSION}
+MAJOR_SUB_VER=	3.8
+#MAJOR_SUB_VER=	${PORTVERSION}
 DOCSDIR=	share/doc/${PORTNAME}-${PORTVERSION}
 USE_GNOME=	pygtk2
 USE_PYQT=	core gui opengl
-USE_WX=		3.0+
-USE_QT=		corelib gui xml qmake moc_build rcc_build uic_build
+USE_WX=		3.0
+USE_QT=		buildtools core gui xml qmake widgets
 WX_COMPS=	wx wx:build wx:run python:build python:run
 USE_LDCONFIG=	yes
-PLIST_SUB+=	MAJOR_VERSION="3"
-PLIST_SUB+=	MAJOR_SUB_VER="${MAJOR_SUB_VER}"
-LIBSTRIP_FILES=	analog atsc audio blocks channels digital dtv fcd fec fft\
-		filter noaa pager pmt qtgui runtime trellis video-sdl\
-		vocoder wavelet wxgui
+PLIST_SUB+=	MAJOR_SUB_VER="${MAJOR_SUB_VER}"git
+LIBSTRIP_FILES=	analog audio blocks channels digital dtv fec fft\
+		filter pmt qtgui runtime trellis video-sdl\
+		vocoder wavelet
 
 OPTIONS_DEFINE=		DOCS UHD TESTING DOXYGEN
 # Unfortunately building docs on i386 fails
@@ -107,7 +112,6 @@ UHD_CMAKE_OFF=	-DENABLE_GR_UHD:STRING="OFF"
 
 TESTING_CMAKE_ON=	-DENABLE_TESTING:STRING="ON"
 TESTING_CMAKE_OFF=	-DENABLE_TESTING:STRING="OFF"
-TESTING_BUILD_DEPENDS=	cppunit-config:devel/cppunit
 
 .include <bsd.port.pre.mk>
 
@@ -122,6 +126,10 @@ PLIST_SUB+=	UHD="@comment "
 PATCH_FILES=	docs/doxygen/Doxyfile.in \
 		gr-fec/lib/CMakeLists.txt
 
+post-extract:
+	@${RMDIR} ${WRKSRC}/volk
+	@${MV} ${WRKSRC_volk} ${WRKSRC}/volk
+
 post-patch:
 	@${FIND} ${WRKSRC}/.. -name CMakeLists.txt | \
 	    ${XARGS} ${REINPLACE_CMD} -e \
@@ -134,7 +142,7 @@ post-patch:
 
 post-install:
 .for a in ${LIBSTRIP_FILES}
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgnuradio-${a}.so.${MAJOR_SUB_VER}
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgnuradio-${a}.so.${MAJOR_SUB_VER}git
 .endfor
 
 .include <bsd.port.post.mk>

Modified: head/comms/gnuradio/distinfo
==============================================================================
--- head/comms/gnuradio/distinfo	Fri Mar 15 23:36:49 2019	(r495838)
+++ head/comms/gnuradio/distinfo	Fri Mar 15 23:57:02 2019	(r495839)
@@ -1,3 +1,5 @@
-TIMESTAMP = 1534033130
-SHA256 (gnuradio-3.7.13.4.tar.gz) = c536c268b1e9c24f1206bbc881a5819ac46e662f4e8beaded6f3f441d3502f0d
-SIZE (gnuradio-3.7.13.4.tar.gz) = 4546663
+TIMESTAMP = 1552668814
+SHA256 (gnuradio-gnuradio-3.8.g20190309-a664001_GH0.tar.gz) = 47b22e4f28b3c44f2ea3da4deee24ead6238ec8de7873d16cbba126fa7bfaa5b
+SIZE (gnuradio-gnuradio-3.8.g20190309-a664001_GH0.tar.gz) = 3406038
+SHA256 (gnuradio-volk-d250816_GH0.tar.gz) = 334da8910cfadc2e1487ef2a651f8eaa472262a4bfd3fa7c38d913c8fc32cbd8
+SIZE (gnuradio-volk-d250816_GH0.tar.gz) = 252477

Modified: head/comms/gnuradio/files/patch-CMakeLists.txt
==============================================================================
--- head/comms/gnuradio/files/patch-CMakeLists.txt	Fri Mar 15 23:36:49 2019	(r495838)
+++ head/comms/gnuradio/files/patch-CMakeLists.txt	Fri Mar 15 23:57:02 2019	(r495839)
@@ -1,20 +1,18 @@
---- CMakeLists.txt.orig	2018-06-13 21:42:48 UTC
+--- CMakeLists.txt.orig	2019-03-09 13:28:14 UTC
 +++ CMakeLists.txt
-@@ -144,6 +144,10 @@ ELSEIF(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
- ELSE()
-     message(warning "C++ standard could not be set because compiler is not GNU, Clang or MSVC.")
- ENDIF()
-+#
-+# This is a workaround for a missing -lgsl -L in the swig build somewhere
-+# it needs to be properly fixed. - db
-+link_directories("/usr/lib" "${LOCALBASE}/lib")
+@@ -31,6 +31,7 @@ cmake_minimum_required(VERSION 3.8)
+ project(gnuradio CXX C)
+ enable_testing()
+ option(BUILD_SHARED_LIBS "Build shared libraries" ON)
++cmake_policy(SET CMP0002 OLD)
  
- IF(CMAKE_C_COMPILER_ID STREQUAL "GNU")
-     SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
-@@ -264,6 +268,14 @@ string(REPLACE "\n" " \\n" COMPILER_INFO ${COMPILER_IN
- ########################################################################
- include(GrPlatform) #define LIB_SUFFIX
- set(GR_RUNTIME_DIR     bin CACHE PATH "Path to install all binaries")
+ # Make sure our local CMake Modules path comes first
+ list(INSERT CMAKE_MODULE_PATH 0 ${CMAKE_SOURCE_DIR}/cmake/Modules)
+@@ -64,6 +65,15 @@ set(GCC_MIN_VERSION "4.8.4")
+ set(CLANG_MIN_VERSION "3.4.0")
+ set(APPLECLANG_MIN_VERSION "500")
+ set(MSVC_MIN_VERSION "1800")
++
 +########################################################################
 +# FreeBSD libdata vs. lib
 +#
@@ -23,63 +21,6 @@
 +else()
 +set(GR_PKGCONFIG_DIR      lib${LIB_SUFFIX})
 +endif()
- set(GR_LIBRARY_DIR     lib${LIB_SUFFIX} CACHE PATH "Path to install libraries")
- set(GR_INCLUDE_DIR     include CACHE PATH "Path to install header files")
- set(GR_DATA_DIR        share CACHE PATH "Base location for data")
-@@ -349,6 +361,42 @@ add_custom_target(uninstall
- include(GrBoost)
  
  ########################################################################
-+# FreeBSD iconv
-+########################################################################
-+if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
-+  message( "-- Adding iconv for FreeBSD")
-+message ("-- ICONV_LIB = ${ICONV_LIB}")
-+
-+  set (ICONV_INCLUDE_DIR ${ICONV_PREFIX}/include)
-+  if (${ICONV_LIB} STREQUAL "X-liconv")
-+      find_library(ICONV_LIBRARY
-+      NAMES iconv
-+      PATHS ${ICONV_PREFIX}/lib
-+    )
-+  else()
-+    find_library(ICONV_LIBRARY
-+      NAMES c
-+      PATHS ${ICONV_PREFIX}/lib
-+    )
-+  endif()
-+
-+message ("-- LIBICONV_PLUG = ${LIBICONV_PLUG}")
-+message ("-- ICONV_PREFIX = ${ICONV_PREFIX}")
-+message ("-- ICONV_INCLUDE_DIRS = ${ICONV_INCLUDE_DIRS}")
-+message ("-- ICONV_INCLUDE_DIR = ${ICONV_INCLUDE_DIR}")
-+message ("-- ICONV_LIB_DIRS = ${ICONV_LIB_DIRS}")
-+message ("-- ICONV_LIBRARY = ${ICONV_LIBRARY}")
-+else()
-+  find_path(ICONV_INCLUDE_DIR
-+    NAMES iconv.h
-+    PATHS ${ICONV_INCLUDE_DIRS}
-+  )
-+  find_library(ICONV_LIBRARY
-+    NAMES iconv
-+    PATHS ${ICONV_LIB_DIRS}
-+  )
-+endif()
-+########################################################################
- # Enable python component
- ########################################################################
- find_package(PythonLibs ${GR_PYTHON_MIN_VERSION})
-@@ -500,11 +548,13 @@ GR_LOGGING()
- ########################################################################
- # Distribute the README file
- ########################################################################
-+if(ENABLE_DOCS)
- install(
-     FILES README.md README.hacking CHANGELOG.md
-     DESTINATION ${GR_PKG_DOC_DIR}
-     COMPONENT "docs"
- )
-+endif()
- 
- ########################################################################
- # The following dependency libraries are needed by all gr modules:
+ # Configure CMake policies

Added: head/comms/gnuradio/files/patch-cmake_Modules_FindQwt.cmake
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/gnuradio/files/patch-cmake_Modules_FindQwt.cmake	Fri Mar 15 23:57:02 2019	(r495839)
@@ -0,0 +1,26 @@
+--- cmake/Modules/FindQwt.cmake.orig	2019-03-09 13:28:14 UTC
++++ cmake/Modules/FindQwt.cmake
+@@ -15,10 +15,11 @@ find_path(QWT_INCLUDE_DIRS
+   ${CMAKE_INSTALL_PREFIX}/include/qwt
+   ${CMAKE_PREFIX_PATH}/include/qwt
+   PATHS
++  /usr/local/include/qt5/qwt6
+   /usr/local/include/qwt-${QWT_QT_VERSION}
++  /usr/include/qt5/qwt
+   /usr/local/include/qwt
+   /usr/include/qwt6
+-  /usr/include/qt5/qwt
+   /usr/include/qwt-${QWT_QT_VERSION}
+   /usr/include/qwt
+   /usr/include/${QWT_QT_VERSION}/qwt
+@@ -29,8 +30,9 @@ find_path(QWT_INCLUDE_DIRS
+ )
+ 
+ find_library (QWT_LIBRARIES
+-  NAMES ${PC_QWT_LIBRARIES} qwt6-${QWT_QT_VERSION} qwt-${QWT_QT_VERSION}
++  NAMES ${PC_QWT_LIBRARIES} qwt6 qwt6-${QWT_QT_VERSION} qwt-${QWT_QT_VERSION}
+   HINTS
++  /usr/local/lib/qt5
+   ${PC_QWT_LIBDIR}
+   ${CMAKE_INSTALL_PREFIX}/lib
+   ${CMAKE_INSTALL_PREFIX}/lib64

Added: head/comms/gnuradio/files/patch-cmake_Modules_GrPython.cmake
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/gnuradio/files/patch-cmake_Modules_GrPython.cmake	Fri Mar 15 23:57:02 2019	(r495839)
@@ -0,0 +1,23 @@
+--- cmake/Modules/GrPython.cmake.orig	2019-03-09 13:28:14 UTC
++++ cmake/Modules/GrPython.cmake
+@@ -101,11 +101,15 @@ if(NOT DEFINED GR_PYTHON_DIR)
+ execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "
+ import os
+ import sys
+-if os.name == 'posix':
+-    print(os.path.join('lib', 'python' + sys.version[:3], 'dist-packages'))
+-if os.name == 'nt':
+-    print(os.path.join('Lib', 'site-packages'))
+-" OUTPUT_VARIABLE GR_PYTHON_DIR OUTPUT_STRIP_TRAILING_WHITESPACE
++from sysconfig import get_platform
++if get_platform().startswith('freebsd'):
++        print(os.path.join('lib', 'python' + sys.version[:3], 'site-packages'))
++else:
++    if os.name == 'posix':
++        print(os.path.join('lib', 'python' + sys.version[:3], 'dist-packages'))
++    if os.name == 'nt':
++        print(os.path.join('Lib', 'site-packages'))
++    " OUTPUT_VARIABLE GR_PYTHON_DIR OUTPUT_STRIP_TRAILING_WHITESPACE
+ )
+ endif()
+ file(TO_CMAKE_PATH ${GR_PYTHON_DIR} GR_PYTHON_DIR)

Modified: head/comms/gnuradio/files/patch-docs_doxygen_Doxyfile.in
==============================================================================
--- head/comms/gnuradio/files/patch-docs_doxygen_Doxyfile.in	Fri Mar 15 23:36:49 2019	(r495838)
+++ head/comms/gnuradio/files/patch-docs_doxygen_Doxyfile.in	Fri Mar 15 23:57:02 2019	(r495839)
@@ -1,6 +1,6 @@
---- docs/doxygen/Doxyfile.in.orig	2018-06-13 21:42:48 UTC
+--- docs/doxygen/Doxyfile.in.orig	2019-03-09 13:28:14 UTC
 +++ docs/doxygen/Doxyfile.in
-@@ -1880,7 +1880,7 @@ DOT_FONTSIZE           = 10
+@@ -1852,7 +1852,7 @@ DOT_FONTSIZE           = 10
  # If you specify a different font using DOT_FONTNAME you can use DOT_FONTPATH to
  # set the path where dot can find it.
  

Added: head/comms/gnuradio/files/patch-gr-vocoder_lib_gsm__fr__decode__ps__impl.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/gnuradio/files/patch-gr-vocoder_lib_gsm__fr__decode__ps__impl.h	Fri Mar 15 23:57:02 2019	(r495839)
@@ -0,0 +1,14 @@
+--- gr-vocoder/lib/gsm_fr_decode_ps_impl.h.orig	2019-03-13 15:13:10 UTC
++++ gr-vocoder/lib/gsm_fr_decode_ps_impl.h
+@@ -26,7 +26,11 @@
+ #include <gnuradio/vocoder/gsm_fr_decode_ps.h>
+ 
+ extern "C"{
++#ifdef __FreeBSD__
++#include <gsm.h>
++#else
+ #include "gsm/gsm.h"
++#endif
+ }
+ 
+ namespace gr {

Added: head/comms/gnuradio/files/patch-gr-vocoder_lib_gsm__fr__encode__sp__impl.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/gnuradio/files/patch-gr-vocoder_lib_gsm__fr__encode__sp__impl.h	Fri Mar 15 23:57:02 2019	(r495839)
@@ -0,0 +1,14 @@
+--- gr-vocoder/lib/gsm_fr_encode_sp_impl.h.orig	2019-03-13 15:22:30 UTC
++++ gr-vocoder/lib/gsm_fr_encode_sp_impl.h
+@@ -26,7 +26,11 @@
+ #include <gnuradio/vocoder/gsm_fr_encode_sp.h>
+ 
+ extern "C"{
++#ifdef __FreeBSD__
++#include <gsm.h>
++#else
+ #include "gsm/gsm.h"
++#endif
+ }
+ 
+ namespace gr {

Modified: head/comms/gnuradio/pkg-descr
==============================================================================
--- head/comms/gnuradio/pkg-descr	Fri Mar 15 23:36:49 2019	(r495838)
+++ head/comms/gnuradio/pkg-descr	Fri Mar 15 23:57:02 2019	(r495839)
@@ -2,6 +2,6 @@ GNU Radio is a collection of software that when combin
 minimal hardware, allows the construction of radios where the
 actual waveforms transmitted and received are defined by software.
 What this means is that it turns the digital modulation schemes
-used in today's high performance wireless devices into software problems. 
+used in today's high performance wireless devices into software problems.
 
-WWW: http://gnuradio.org/redmine/projects/gnuradio
+WWW: http://gnuradio.org

Modified: head/comms/gnuradio/pkg-plist
==============================================================================
--- head/comms/gnuradio/pkg-plist	Fri Mar 15 23:36:49 2019	(r495838)
+++ head/comms/gnuradio/pkg-plist	Fri Mar 15 23:57:02 2019	(r495839)
@@ -1,46 +1,32 @@
+%%UHD%%libdata/pkgconfig/gnuradio-uhd.pc
+libdata/pkgconfig/gnuradio-analog.pc
+libdata/pkgconfig/gnuradio-audio.pc
+libdata/pkgconfig/gnuradio-blocks.pc
+libdata/pkgconfig/gnuradio-channels.pc
+libdata/pkgconfig/gnuradio-digital.pc
+libdata/pkgconfig/gnuradio-dtv.pc
+libdata/pkgconfig/gnuradio-fec.pc
+libdata/pkgconfig/gnuradio-fft.pc
+libdata/pkgconfig/gnuradio-filter.pc
+libdata/pkgconfig/gnuradio-qtgui.pc
+libdata/pkgconfig/gnuradio-runtime.pc
+libdata/pkgconfig/gnuradio-trellis.pc
+libdata/pkgconfig/gnuradio-video-sdl.pc
+libdata/pkgconfig/gnuradio-vocoder.pc
+libdata/pkgconfig/gnuradio-wavelet.pc
 bin/gnuradio-companion
 bin/gnuradio-config-info
 bin/gr-ctrlport-monitor
-bin/gr-ctrlport-monitorc
-bin/gr-ctrlport-monitoro
 bin/gr-perf-monitorx
-bin/gr-perf-monitorxc
-bin/gr-perf-monitorxo
-bin/gr_constellation_plot
 bin/gr_filter_design
 bin/gr_modtool
-bin/gr_plot_char
+bin/gr_plot
 bin/gr_plot_const
 bin/gr_plot_fft
-bin/gr_plot_fft_c
-bin/gr_plot_fft_f
-bin/gr_plot_float
-bin/gr_plot_int
 bin/gr_plot_iq
 bin/gr_plot_psd
-bin/gr_plot_psd_c
-bin/gr_plot_psd_f
 bin/gr_plot_qt
-bin/gr_plot_short
-bin/gr_psd_plot_b
-bin/gr_psd_plot_c
-bin/gr_psd_plot_f
-bin/gr_psd_plot_i
-bin/gr_psd_plot_s
 bin/gr_read_file_metadata
-bin/gr_spectrogram_plot
-bin/gr_spectrogram_plot_b
-bin/gr_spectrogram_plot_c
-bin/gr_spectrogram_plot_f
-bin/gr_spectrogram_plot_i
-bin/gr_spectrogram_plot_s
-bin/gr_time_plot_b
-bin/gr_time_plot_c
-bin/gr_time_plot_f
-bin/gr_time_plot_i
-bin/gr_time_plot_s
-bin/gr_time_raster_b
-bin/gr_time_raster_f
 bin/grcc
 bin/polar_channel_construction
 %%UHD%%bin/uhd_fft
@@ -48,9 +34,6 @@ bin/polar_channel_construction
 %%UHD%%bin/uhd_rx_nogui
 %%UHD%%bin/uhd_siggen
 %%UHD%%bin/uhd_siggen_gui
-bin/usrp_flex
-bin/usrp_flex_all
-bin/usrp_flex_band
 bin/volk-config-info
 bin/volk_modtool
 bin/volk_profile
@@ -61,7 +44,6 @@ bin/volk_profile
 %%ETCDIR%%/conf.d/gr-audio-portaudio.conf
 %%ETCDIR%%/conf.d/gr-audio.conf
 %%ETCDIR%%/conf.d/gr-qtgui.conf
-%%ETCDIR%%/conf.d/gr-wxgui.conf
 %%ETCDIR%%/conf.d/gr_log_default.conf
 %%ETCDIR%%/conf.d/grc.conf
 %%ETCDIR%%/conf.d/modtool.conf
@@ -69,7 +51,7 @@ include/gnuradio/analog/agc.h
 include/gnuradio/analog/agc2.h
 include/gnuradio/analog/agc2_cc.h
 include/gnuradio/analog/agc2_ff.h
-include/gnuradio/analog/agc%%MAJOR_VERSION%%_cc.h
+include/gnuradio/analog/agc3_cc.h
 include/gnuradio/analog/agc_cc.h
 include/gnuradio/analog/agc_ff.h
 include/gnuradio/analog/api.h
@@ -77,17 +59,11 @@ include/gnuradio/analog/cpfsk_bc.h
 include/gnuradio/analog/cpm.h
 include/gnuradio/analog/ctcss_squelch_ff.h
 include/gnuradio/analog/dpll_bb.h
-include/gnuradio/analog/fastnoise_source_c.h
-include/gnuradio/analog/fastnoise_source_f.h
-include/gnuradio/analog/fastnoise_source_i.h
-include/gnuradio/analog/fastnoise_source_s.h
+include/gnuradio/analog/fastnoise_source.h
 include/gnuradio/analog/feedforward_agc_cc.h
 include/gnuradio/analog/fmdet_cf.h
 include/gnuradio/analog/frequency_modulator_fc.h
-include/gnuradio/analog/noise_source_c.h
-include/gnuradio/analog/noise_source_f.h
-include/gnuradio/analog/noise_source_i.h
-include/gnuradio/analog/noise_source_s.h
+include/gnuradio/analog/noise_source.h
 include/gnuradio/analog/noise_type.h
 include/gnuradio/analog/phase_modulator_fc.h
 include/gnuradio/analog/pll_carriertracking_cc.h
@@ -100,67 +76,13 @@ include/gnuradio/analog/pwr_squelch_cc.h
 include/gnuradio/analog/pwr_squelch_ff.h
 include/gnuradio/analog/quadrature_demod_cf.h
 include/gnuradio/analog/rail_ff.h
-include/gnuradio/analog/random_uniform_source_b.h
-include/gnuradio/analog/random_uniform_source_i.h
-include/gnuradio/analog/random_uniform_source_s.h
-include/gnuradio/analog/sig_source_c.h
-include/gnuradio/analog/sig_source_f.h
-include/gnuradio/analog/sig_source_i.h
-include/gnuradio/analog/sig_source_s.h
+include/gnuradio/analog/random_uniform_source.h
+include/gnuradio/analog/sig_source.h
 include/gnuradio/analog/sig_source_waveform.h
 include/gnuradio/analog/simple_squelch_cc.h
 include/gnuradio/analog/squelch_base_cc.h
 include/gnuradio/analog/squelch_base_ff.h
 include/gnuradio/api.h
-include/gnuradio/atsc/GrAtscSegSymSyncImpl_export.h
-include/gnuradio/atsc/api.h
-include/gnuradio/atsc/basic_trellis_encoder_impl.h
-include/gnuradio/atsc/bit_timing_loop.h
-include/gnuradio/atsc/consts.h
-include/gnuradio/atsc/convolutional_interleaver.h
-include/gnuradio/atsc/create_atsci_equalizer.h
-include/gnuradio/atsc/create_atsci_fs_checker.h
-include/gnuradio/atsc/create_atsci_fs_correlator.h
-include/gnuradio/atsc/data_interleaver_impl.h
-include/gnuradio/atsc/deinterleaver.h
-include/gnuradio/atsc/depad.h
-include/gnuradio/atsc/derandomizer.h
-include/gnuradio/atsc/diag_output_impl.h
-include/gnuradio/atsc/ds_to_softds.h
-include/gnuradio/atsc/equalizer.h
-include/gnuradio/atsc/equalizer_impl.h
-include/gnuradio/atsc/equalizer_lms2_impl.h
-include/gnuradio/atsc/equalizer_lms_impl.h
-include/gnuradio/atsc/equalizer_nop_impl.h
-include/gnuradio/atsc/fake_single_viterbi_impl.h
-include/gnuradio/atsc/field_sync_demux.h
-include/gnuradio/atsc/field_sync_mux.h
-include/gnuradio/atsc/fpll.h
-include/gnuradio/atsc/fs_checker.h
-include/gnuradio/atsc/fs_checker_impl.h
-include/gnuradio/atsc/fs_checker_naive_impl.h
-include/gnuradio/atsc/fs_correlator_impl.h
-include/gnuradio/atsc/fs_correlator_naive_impl.h
-include/gnuradio/atsc/interleaver.h
-include/gnuradio/atsc/interleaver_fifo.h
-include/gnuradio/atsc/pad.h
-include/gnuradio/atsc/pnXXX_impl.h
-include/gnuradio/atsc/randomizer.h
-include/gnuradio/atsc/randomizer_impl.h
-include/gnuradio/atsc/reed_solomon_impl.h
-include/gnuradio/atsc/rs_decoder.h
-include/gnuradio/atsc/rs_encoder.h
-include/gnuradio/atsc/single_viterbi_impl.h
-include/gnuradio/atsc/slicer_agc_impl.h
-include/gnuradio/atsc/sliding_correlator_impl.h
-include/gnuradio/atsc/sssr_impl.h
-include/gnuradio/atsc/syminfo_impl.h
-include/gnuradio/atsc/sync_tag_impl.h
-include/gnuradio/atsc/trellis_encoder.h
-include/gnuradio/atsc/trellis_encoder_impl.h
-include/gnuradio/atsc/types.h
-include/gnuradio/atsc/viterbi_decoder.h
-include/gnuradio/atsc/viterbi_decoder_impl.h
 include/gnuradio/attributes.h
 include/gnuradio/audio/api.h
 include/gnuradio/audio/sink.h
@@ -170,44 +92,30 @@ include/gnuradio/block.h
 include/gnuradio/block_detail.h
 include/gnuradio/block_gateway.h
 include/gnuradio/block_registry.h
-include/gnuradio/blocks/abs_ff.h
-include/gnuradio/blocks/abs_ii.h
-include/gnuradio/blocks/abs_ss.h
-include/gnuradio/blocks/add_cc.h
+include/gnuradio/blocks/abs_blk.h
+include/gnuradio/blocks/add_blk.h
 include/gnuradio/blocks/add_const_bb.h
 include/gnuradio/blocks/add_const_cc.h
 include/gnuradio/blocks/add_const_ff.h
 include/gnuradio/blocks/add_const_ii.h
 include/gnuradio/blocks/add_const_ss.h
-include/gnuradio/blocks/add_const_vbb.h
-include/gnuradio/blocks/add_const_vcc.h
-include/gnuradio/blocks/add_const_vff.h
-include/gnuradio/blocks/add_const_vii.h
-include/gnuradio/blocks/add_const_vss.h
-include/gnuradio/blocks/add_ff.h
-include/gnuradio/blocks/add_ii.h
-include/gnuradio/blocks/add_ss.h
-include/gnuradio/blocks/and_bb.h
-include/gnuradio/blocks/and_const_bb.h
-include/gnuradio/blocks/and_const_ii.h
-include/gnuradio/blocks/and_const_ss.h
-include/gnuradio/blocks/and_ii.h
-include/gnuradio/blocks/and_ss.h
+include/gnuradio/blocks/add_const_v.h
+include/gnuradio/blocks/and_blk.h
+include/gnuradio/blocks/and_const.h
 include/gnuradio/blocks/annotator_1to1.h
 include/gnuradio/blocks/annotator_alltoall.h
 include/gnuradio/blocks/annotator_raw.h
 include/gnuradio/blocks/api.h
-include/gnuradio/blocks/argmax_fs.h
-include/gnuradio/blocks/argmax_is.h
-include/gnuradio/blocks/argmax_ss.h
+include/gnuradio/blocks/argmax.h
 include/gnuradio/blocks/bin_statistics_f.h
 include/gnuradio/blocks/burst_tagger.h
 include/gnuradio/blocks/char_to_float.h
 include/gnuradio/blocks/char_to_short.h
-include/gnuradio/blocks/check_lfsr_%%MAJOR_VERSION%%2k_s.h
+include/gnuradio/blocks/check_lfsr_32k_s.h
 include/gnuradio/blocks/complex_to_arg.h
 include/gnuradio/blocks/complex_to_float.h
 include/gnuradio/blocks/complex_to_imag.h
+include/gnuradio/blocks/complex_to_interleaved_char.h
 include/gnuradio/blocks/complex_to_interleaved_short.h
 include/gnuradio/blocks/complex_to_mag.h
 include/gnuradio/blocks/complex_to_mag_squared.h
@@ -225,10 +133,7 @@ include/gnuradio/blocks/ctrlport_probe2_s.h
 include/gnuradio/blocks/ctrlport_probe_c.h
 include/gnuradio/blocks/deinterleave.h
 include/gnuradio/blocks/delay.h
-include/gnuradio/blocks/divide_cc.h
-include/gnuradio/blocks/divide_ff.h
-include/gnuradio/blocks/divide_ii.h
-include/gnuradio/blocks/divide_ss.h
+include/gnuradio/blocks/divide.h
 include/gnuradio/blocks/endian_swap.h
 include/gnuradio/blocks/exponentiate_const_cci.h
 include/gnuradio/blocks/file_descriptor_sink.h
@@ -245,93 +150,51 @@ include/gnuradio/blocks/float_to_short.h
 include/gnuradio/blocks/float_to_uchar.h
 include/gnuradio/blocks/head.h
 include/gnuradio/blocks/int_to_float.h
-include/gnuradio/blocks/integrate_cc.h
-include/gnuradio/blocks/integrate_ff.h
-include/gnuradio/blocks/integrate_ii.h
-include/gnuradio/blocks/integrate_ss.h
+include/gnuradio/blocks/integrate.h
 include/gnuradio/blocks/interleave.h
 include/gnuradio/blocks/interleaved_char_to_complex.h
 include/gnuradio/blocks/interleaved_short_to_complex.h
 include/gnuradio/blocks/keep_m_in_n.h
 include/gnuradio/blocks/keep_one_in_n.h
 include/gnuradio/blocks/lfsr_15_1_0.h
-include/gnuradio/blocks/lfsr_%%MAJOR_VERSION%%2k.h
-include/gnuradio/blocks/lfsr_%%MAJOR_VERSION%%2k_source_s.h
+include/gnuradio/blocks/lfsr_32k.h
+include/gnuradio/blocks/lfsr_32k_source_s.h
 include/gnuradio/blocks/log2_const.h
 include/gnuradio/blocks/magphase_to_complex.h
-include/gnuradio/blocks/max_ff.h
-include/gnuradio/blocks/max_ii.h
-include/gnuradio/blocks/max_ss.h
-include/gnuradio/blocks/message_burst_source.h
+include/gnuradio/blocks/max_blk.h
 include/gnuradio/blocks/message_debug.h
-include/gnuradio/blocks/message_sink.h
-include/gnuradio/blocks/message_source.h
 include/gnuradio/blocks/message_strobe.h
 include/gnuradio/blocks/message_strobe_random.h
-include/gnuradio/blocks/min_ff.h
-include/gnuradio/blocks/min_ii.h
-include/gnuradio/blocks/min_ss.h
-include/gnuradio/blocks/moving_average_cc.h
-include/gnuradio/blocks/moving_average_ff.h
-include/gnuradio/blocks/moving_average_ii.h
-include/gnuradio/blocks/moving_average_ss.h
+include/gnuradio/blocks/min_blk.h
+include/gnuradio/blocks/moving_average.h
+include/gnuradio/blocks/multiply.h
 include/gnuradio/blocks/multiply_by_tag_value_cc.h
-include/gnuradio/blocks/multiply_cc.h
 include/gnuradio/blocks/multiply_conjugate_cc.h
-include/gnuradio/blocks/multiply_const_cc.h
-include/gnuradio/blocks/multiply_const_ff.h
-include/gnuradio/blocks/multiply_const_ii.h
-include/gnuradio/blocks/multiply_const_ss.h
-include/gnuradio/blocks/multiply_const_vcc.h
-include/gnuradio/blocks/multiply_const_vff.h
-include/gnuradio/blocks/multiply_const_vii.h
-include/gnuradio/blocks/multiply_const_vss.h
-include/gnuradio/blocks/multiply_ff.h
-include/gnuradio/blocks/multiply_ii.h
-include/gnuradio/blocks/multiply_matrix_cc.h
-include/gnuradio/blocks/multiply_matrix_ff.h
-include/gnuradio/blocks/multiply_ss.h
-include/gnuradio/blocks/mute_cc.h
-include/gnuradio/blocks/mute_ff.h
-include/gnuradio/blocks/mute_ii.h
-include/gnuradio/blocks/mute_ss.h
+include/gnuradio/blocks/multiply_const.h
+include/gnuradio/blocks/multiply_const_v.h
+include/gnuradio/blocks/multiply_matrix.h
+include/gnuradio/blocks/mute.h
 include/gnuradio/blocks/nlog10_ff.h
 include/gnuradio/blocks/nop.h
-include/gnuradio/blocks/not_bb.h
-include/gnuradio/blocks/not_ii.h
-include/gnuradio/blocks/not_ss.h
+include/gnuradio/blocks/not_blk.h
 include/gnuradio/blocks/null_sink.h
 include/gnuradio/blocks/null_source.h
-include/gnuradio/blocks/or_bb.h
-include/gnuradio/blocks/or_ii.h
-include/gnuradio/blocks/or_ss.h
+include/gnuradio/blocks/or_blk.h
 include/gnuradio/blocks/pack_k_bits.h
 include/gnuradio/blocks/pack_k_bits_bb.h
-include/gnuradio/blocks/packed_to_unpacked_bb.h
-include/gnuradio/blocks/packed_to_unpacked_ii.h
-include/gnuradio/blocks/packed_to_unpacked_ss.h
+include/gnuradio/blocks/packed_to_unpacked.h
 include/gnuradio/blocks/patterned_interleaver.h
 include/gnuradio/blocks/pdu.h
 include/gnuradio/blocks/pdu_filter.h
 include/gnuradio/blocks/pdu_remove.h
 include/gnuradio/blocks/pdu_set.h
 include/gnuradio/blocks/pdu_to_tagged_stream.h
+include/gnuradio/blocks/peak_detector.h
 include/gnuradio/blocks/peak_detector2_fb.h
-include/gnuradio/blocks/peak_detector_fb.h
-include/gnuradio/blocks/peak_detector_ib.h
-include/gnuradio/blocks/peak_detector_sb.h
 include/gnuradio/blocks/plateau_detector_fb.h
 include/gnuradio/blocks/probe_rate.h
-include/gnuradio/blocks/probe_signal_b.h
-include/gnuradio/blocks/probe_signal_c.h
-include/gnuradio/blocks/probe_signal_f.h
-include/gnuradio/blocks/probe_signal_i.h
-include/gnuradio/blocks/probe_signal_s.h
-include/gnuradio/blocks/probe_signal_vb.h
-include/gnuradio/blocks/probe_signal_vc.h
-include/gnuradio/blocks/probe_signal_vf.h
-include/gnuradio/blocks/probe_signal_vi.h
-include/gnuradio/blocks/probe_signal_vs.h
+include/gnuradio/blocks/probe_signal.h
+include/gnuradio/blocks/probe_signal_v.h
 include/gnuradio/blocks/random_pdu.h
 include/gnuradio/blocks/regenerate_bb.h
 include/gnuradio/blocks/repack_bits_bb.h
@@ -340,10 +203,7 @@ include/gnuradio/blocks/rms_cf.h
 include/gnuradio/blocks/rms_ff.h
 include/gnuradio/blocks/rotator.h
 include/gnuradio/blocks/rotator_cc.h
-include/gnuradio/blocks/sample_and_hold_bb.h
-include/gnuradio/blocks/sample_and_hold_ff.h
-include/gnuradio/blocks/sample_and_hold_ii.h
-include/gnuradio/blocks/sample_and_hold_ss.h
+include/gnuradio/blocks/sample_and_hold.h
 include/gnuradio/blocks/short_to_char.h
 include/gnuradio/blocks/short_to_float.h
 include/gnuradio/blocks/skiphead.h
@@ -355,10 +215,7 @@ include/gnuradio/blocks/stream_to_vector.h
 include/gnuradio/blocks/streams_to_stream.h
 include/gnuradio/blocks/streams_to_vector.h
 include/gnuradio/blocks/stretch_ff.h
-include/gnuradio/blocks/sub_cc.h
-include/gnuradio/blocks/sub_ff.h
-include/gnuradio/blocks/sub_ii.h
-include/gnuradio/blocks/sub_ss.h
+include/gnuradio/blocks/sub.h
 include/gnuradio/blocks/tag_debug.h
 include/gnuradio/blocks/tag_gate.h
 include/gnuradio/blocks/tag_share.h
@@ -373,65 +230,40 @@ include/gnuradio/blocks/test_tag_variable_rate_ff.h
 include/gnuradio/blocks/threshold_ff.h
 include/gnuradio/blocks/throttle.h
 include/gnuradio/blocks/transcendental.h
-include/gnuradio/blocks/tsb_vector_sink_b.h
-include/gnuradio/blocks/tsb_vector_sink_c.h
-include/gnuradio/blocks/tsb_vector_sink_f.h
-include/gnuradio/blocks/tsb_vector_sink_i.h
-include/gnuradio/blocks/tsb_vector_sink_s.h
+include/gnuradio/blocks/tsb_vector_sink.h
 include/gnuradio/blocks/tuntap_pdu.h
 include/gnuradio/blocks/uchar_to_float.h
 include/gnuradio/blocks/udp_sink.h
 include/gnuradio/blocks/udp_source.h
 include/gnuradio/blocks/unpack_k_bits.h
 include/gnuradio/blocks/unpack_k_bits_bb.h
-include/gnuradio/blocks/unpacked_to_packed_bb.h
-include/gnuradio/blocks/unpacked_to_packed_ii.h
-include/gnuradio/blocks/unpacked_to_packed_ss.h
+include/gnuradio/blocks/unpacked_to_packed.h
 include/gnuradio/blocks/vco_c.h
 include/gnuradio/blocks/vco_f.h
-include/gnuradio/blocks/vector_insert_b.h
-include/gnuradio/blocks/vector_insert_c.h
-include/gnuradio/blocks/vector_insert_f.h
-include/gnuradio/blocks/vector_insert_i.h
-include/gnuradio/blocks/vector_insert_s.h
+include/gnuradio/blocks/vector_insert.h
 include/gnuradio/blocks/vector_map.h
-include/gnuradio/blocks/vector_sink_b.h
-include/gnuradio/blocks/vector_sink_c.h
-include/gnuradio/blocks/vector_sink_f.h
-include/gnuradio/blocks/vector_sink_i.h
-include/gnuradio/blocks/vector_sink_s.h
-include/gnuradio/blocks/vector_source_b.h
-include/gnuradio/blocks/vector_source_c.h
-include/gnuradio/blocks/vector_source_f.h
-include/gnuradio/blocks/vector_source_i.h
-include/gnuradio/blocks/vector_source_s.h
+include/gnuradio/blocks/vector_sink.h
+include/gnuradio/blocks/vector_source.h
 include/gnuradio/blocks/vector_to_stream.h
 include/gnuradio/blocks/vector_to_streams.h
 include/gnuradio/blocks/wavfile.h
 include/gnuradio/blocks/wavfile_sink.h
 include/gnuradio/blocks/wavfile_source.h
-include/gnuradio/blocks/xor_bb.h
-include/gnuradio/blocks/xor_ii.h
-include/gnuradio/blocks/xor_ss.h
+include/gnuradio/blocks/xor_blk.h
 include/gnuradio/buffer.h
 include/gnuradio/channels/api.h
 include/gnuradio/channels/channel_model.h
 include/gnuradio/channels/channel_model2.h
 include/gnuradio/channels/fading_model.h
 include/gnuradio/channels/selective_fading_model.h
+include/gnuradio/channels/selective_fading_model2.h
 include/gnuradio/config.h
 include/gnuradio/constants.h
 include/gnuradio/digital/additive_scrambler_bb.h
 include/gnuradio/digital/api.h
 include/gnuradio/digital/binary_slicer_fb.h
-include/gnuradio/digital/burst_shaper_cc.h
-include/gnuradio/digital/burst_shaper_ff.h
-include/gnuradio/digital/chunks_to_symbols_bc.h
-include/gnuradio/digital/chunks_to_symbols_bf.h
-include/gnuradio/digital/chunks_to_symbols_ic.h
-include/gnuradio/digital/chunks_to_symbols_if.h
-include/gnuradio/digital/chunks_to_symbols_sc.h
-include/gnuradio/digital/chunks_to_symbols_sf.h
+include/gnuradio/digital/burst_shaper.h
+include/gnuradio/digital/chunks_to_symbols.h
 include/gnuradio/digital/clock_recovery_mm_cc.h
 include/gnuradio/digital/clock_recovery_mm_ff.h
 include/gnuradio/digital/cma_equalizer_cc.h
@@ -445,12 +277,11 @@ include/gnuradio/digital/correlate_access_code_bb_ts.h
 include/gnuradio/digital/correlate_access_code_ff_ts.h
 include/gnuradio/digital/correlate_access_code_tag_bb.h
 include/gnuradio/digital/correlate_access_code_tag_ff.h
-include/gnuradio/digital/correlate_and_sync_cc.h
 include/gnuradio/digital/costas_loop_cc.h
 include/gnuradio/digital/cpmmod_bc.h
-include/gnuradio/digital/crc%%MAJOR_VERSION%%2.h
-include/gnuradio/digital/crc%%MAJOR_VERSION%%2_async_bb.h
-include/gnuradio/digital/crc%%MAJOR_VERSION%%2_bb.h
+include/gnuradio/digital/crc32.h
+include/gnuradio/digital/crc32_async_bb.h
+include/gnuradio/digital/crc32_bb.h
 include/gnuradio/digital/descrambler_bb.h
 include/gnuradio/digital/diff_decoder_bb.h
 include/gnuradio/digital/diff_encoder_bb.h
@@ -476,7 +307,6 @@ include/gnuradio/digital/lms_dd_equalizer_cc.h
 include/gnuradio/digital/map_bb.h
 include/gnuradio/digital/metric_type.h
 include/gnuradio/digital/modulate_vector.h
-include/gnuradio/digital/mpsk_receiver_cc.h
 include/gnuradio/digital/mpsk_snr_est.h
 include/gnuradio/digital/mpsk_snr_est_cc.h
 include/gnuradio/digital/msk_timing_recovery_cc.h
@@ -486,12 +316,7 @@ include/gnuradio/digital/ofdm_cyclic_prefixer.h
 include/gnuradio/digital/ofdm_equalizer_base.h
 include/gnuradio/digital/ofdm_equalizer_simpledfe.h
 include/gnuradio/digital/ofdm_equalizer_static.h
-include/gnuradio/digital/ofdm_frame_acquisition.h
 include/gnuradio/digital/ofdm_frame_equalizer_vcvc.h
-include/gnuradio/digital/ofdm_frame_sink.h
-include/gnuradio/digital/ofdm_insert_preamble.h
-include/gnuradio/digital/ofdm_mapper_bcv.h
-include/gnuradio/digital/ofdm_sampler.h
 include/gnuradio/digital/ofdm_serializer_vcc.h
 include/gnuradio/digital/ofdm_sync_sc_cfb.h
 include/gnuradio/digital/packet_header_default.h
@@ -575,8 +400,6 @@ include/gnuradio/dtv/dvbt_symbol_inner_interleaver.h
 include/gnuradio/dtv/dvbt_viterbi_decoder.h
 include/gnuradio/endianness.h
 include/gnuradio/expj.h
-include/gnuradio/fcd/api.h
-include/gnuradio/fcd/source_c.h
 include/gnuradio/fec/alist.h
 include/gnuradio/fec/api.h
 include/gnuradio/fec/async_decoder.h
@@ -647,24 +470,10 @@ include/gnuradio/filter/filter_delay_fc.h
 include/gnuradio/filter/filterbank.h
 include/gnuradio/filter/filterbank_vcvcf.h
 include/gnuradio/filter/fir_filter.h
-include/gnuradio/filter/fir_filter_ccc.h
-include/gnuradio/filter/fir_filter_ccf.h
-include/gnuradio/filter/fir_filter_fcc.h
-include/gnuradio/filter/fir_filter_fff.h
-include/gnuradio/filter/fir_filter_fsf.h
-include/gnuradio/filter/fir_filter_scc.h
+include/gnuradio/filter/fir_filter_blk.h
 include/gnuradio/filter/fir_filter_with_buffer.h
 include/gnuradio/filter/firdes.h
-include/gnuradio/filter/fractional_interpolator_cc.h
-include/gnuradio/filter/fractional_interpolator_ff.h
-include/gnuradio/filter/fractional_resampler_cc.h
-include/gnuradio/filter/fractional_resampler_ff.h
-include/gnuradio/filter/freq_xlating_fir_filter_ccc.h
-include/gnuradio/filter/freq_xlating_fir_filter_ccf.h
-include/gnuradio/filter/freq_xlating_fir_filter_fcc.h
-include/gnuradio/filter/freq_xlating_fir_filter_fcf.h
-include/gnuradio/filter/freq_xlating_fir_filter_scc.h
-include/gnuradio/filter/freq_xlating_fir_filter_scf.h
+include/gnuradio/filter/freq_xlating_fir_filter.h
 include/gnuradio/filter/hilbert_fc.h
 include/gnuradio/filter/iir_filter.h
 include/gnuradio/filter/iir_filter_ccc.h
@@ -672,17 +481,16 @@ include/gnuradio/filter/iir_filter_ccd.h
 include/gnuradio/filter/iir_filter_ccf.h
 include/gnuradio/filter/iir_filter_ccz.h
 include/gnuradio/filter/iir_filter_ffd.h
-include/gnuradio/filter/interp_fir_filter_ccc.h
-include/gnuradio/filter/interp_fir_filter_ccf.h
-include/gnuradio/filter/interp_fir_filter_fcc.h
-include/gnuradio/filter/interp_fir_filter_fff.h
-include/gnuradio/filter/interp_fir_filter_fsf.h
-include/gnuradio/filter/interp_fir_filter_scc.h
+include/gnuradio/filter/interp_fir_filter.h
 include/gnuradio/filter/interpolator_taps.h
 include/gnuradio/filter/mmse_fir_interpolator_cc.h
 include/gnuradio/filter/mmse_fir_interpolator_ff.h
 include/gnuradio/filter/mmse_interp_differentiator_cc.h
 include/gnuradio/filter/mmse_interp_differentiator_ff.h
+include/gnuradio/filter/mmse_interpolator_cc.h
+include/gnuradio/filter/mmse_interpolator_ff.h
+include/gnuradio/filter/mmse_resampler_cc.h
+include/gnuradio/filter/mmse_resampler_ff.h
 include/gnuradio/filter/pfb_arb_resampler.h
 include/gnuradio/filter/pfb_arb_resampler_ccc.h
 include/gnuradio/filter/pfb_arb_resampler_ccf.h
@@ -693,12 +501,7 @@ include/gnuradio/filter/pfb_interpolator_ccf.h
 include/gnuradio/filter/pfb_synthesizer_ccf.h
 include/gnuradio/filter/pm_remez.h
 include/gnuradio/filter/polyphase_filterbank.h
-include/gnuradio/filter/rational_resampler_base_ccc.h
-include/gnuradio/filter/rational_resampler_base_ccf.h
-include/gnuradio/filter/rational_resampler_base_fcc.h
-include/gnuradio/filter/rational_resampler_base_fff.h
-include/gnuradio/filter/rational_resampler_base_fsf.h
-include/gnuradio/filter/rational_resampler_base_scc.h
+include/gnuradio/filter/rational_resampler_base.h
 include/gnuradio/filter/single_pole_iir.h
 include/gnuradio/filter/single_pole_iir_filter_cc.h
 include/gnuradio/filter/single_pole_iir_filter_ff.h
@@ -723,17 +526,6 @@ include/gnuradio/msg_accepter.h
 include/gnuradio/msg_handler.h
 include/gnuradio/msg_queue.h
 include/gnuradio/nco.h
-include/gnuradio/noaa/api.h
-include/gnuradio/noaa/hrpt.h
-include/gnuradio/noaa/hrpt_decoder.h
-include/gnuradio/noaa/hrpt_deframer.h
-include/gnuradio/noaa/hrpt_pll_cf.h
-include/gnuradio/pager/api.h
-include/gnuradio/pager/flex_deinterleave.h
-include/gnuradio/pager/flex_frame.h
-include/gnuradio/pager/flex_parse.h
-include/gnuradio/pager/flex_sync.h
-include/gnuradio/pager/slicer_fb.h
 include/gnuradio/prefs.h
 include/gnuradio/py_feval.h
 include/gnuradio/pycallback_object.h
@@ -800,8 +592,6 @@ include/gnuradio/sincos.h
 include/gnuradio/sptr_magic.h
 include/gnuradio/swig/analog_swig.i
 include/gnuradio/swig/analog_swig_doc.i
-include/gnuradio/swig/atsc_swig.i
-include/gnuradio/swig/atsc_swig_doc.i
 include/gnuradio/swig/audio_swig.i
 include/gnuradio/swig/audio_swig_doc.i
 include/gnuradio/swig/basic_block.i
@@ -816,8 +606,8 @@ include/gnuradio/swig/blocks_swig10_doc.i
 include/gnuradio/swig/blocks_swig1_doc.i
 include/gnuradio/swig/blocks_swig2.i
 include/gnuradio/swig/blocks_swig2_doc.i
-include/gnuradio/swig/blocks_swig%%MAJOR_VERSION%%.i
-include/gnuradio/swig/blocks_swig%%MAJOR_VERSION%%_doc.i
+include/gnuradio/swig/blocks_swig3.i
+include/gnuradio/swig/blocks_swig3_doc.i
 include/gnuradio/swig/blocks_swig4.i
 include/gnuradio/swig/blocks_swig4_doc.i
 include/gnuradio/swig/blocks_swig5.i
@@ -833,7 +623,6 @@ include/gnuradio/swig/blocks_swig9_doc.i
 include/gnuradio/swig/buffer.i
 include/gnuradio/swig/channels_swig.i
 include/gnuradio/swig/channels_swig_doc.i
-include/gnuradio/swig/complex_vec_test.i
 include/gnuradio/swig/constants.i
 include/gnuradio/swig/constellation.i
 include/gnuradio/swig/digital_swig0.i
@@ -844,8 +633,6 @@ include/gnuradio/swig/digital_swig2.i
 include/gnuradio/swig/digital_swig2_doc.i
 include/gnuradio/swig/dtv_swig.i
 include/gnuradio/swig/dtv_swig_doc.i
-include/gnuradio/swig/fcd_swig.i
-include/gnuradio/swig/fcd_swig_doc.i
 include/gnuradio/swig/fec_swig.i
 include/gnuradio/swig/fec_swig_doc.i
 include/gnuradio/swig/feval.i
@@ -853,7 +640,6 @@ include/gnuradio/swig/fft_swig.i
 include/gnuradio/swig/fft_swig_doc.i
 include/gnuradio/swig/filter_swig.i
 include/gnuradio/swig/gnuradio.i
-include/gnuradio/swig/gnuradio_swig_bug_workaround.h
 include/gnuradio/swig/gr_ctrlport.i
 include/gnuradio/swig/gr_extras.i
 include/gnuradio/swig/gr_filter_swig_doc.i
@@ -867,21 +653,17 @@ include/gnuradio/swig/io_signature.i
 include/gnuradio/swig/message.i
 include/gnuradio/swig/msg_handler.i
 include/gnuradio/swig/msg_queue.i
-include/gnuradio/swig/noaa_swig.i
-include/gnuradio/swig/noaa_swig_doc.i
 include/gnuradio/swig/ofdm_equalizer.i
 include/gnuradio/swig/packet_header.i
-include/gnuradio/swig/pager_swig.i
-include/gnuradio/swig/pager_swig_doc.i
 include/gnuradio/swig/pmt_swig.i
 include/gnuradio/swig/pmt_swig_doc.i
 include/gnuradio/swig/prefs.i
+include/gnuradio/swig/py3compat.i
 include/gnuradio/swig/qtgui_swig.i
 include/gnuradio/swig/qtgui_swig_doc.i
 include/gnuradio/swig/realtime.i
 include/gnuradio/swig/runtime_swig.i
 include/gnuradio/swig/runtime_swig_doc.i
-include/gnuradio/swig/single_threaded_scheduler.i

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903152357.x2FNv35f067670>