Attachment 161640 Details for Bug 203500 – gnuradio.patch

[patch] gnuradio.patch

gnuradio.patch (text/plain), 58.67 KB, created by takefu on 2015-10-02 04:13:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: takefu

Created: 2015-10-02 04:13:07 UTC

Size: 58.67 KB

patch

obsolete

>diff -dpruN /usr/ports/comms/gnuradio/Makefile ./Makefile
>--- /usr/ports/comms/gnuradio/Makefile	2015-09-14 11:16:55.000000000 +0000
>+++ ./Makefile	2015-09-25 00:42:20.000000000 +0000
>@@ -1,8 +1,7 @@
> # $FreeBSD: head/comms/gnuradio/Makefile 396889 2015-09-14 11:16:55Z amdmi3 $
> 
> PORTNAME=	gnuradio
>-PORTVERSION=	3.7.7.1
>-PORTREVISION=	1
>+PORTVERSION=	3.7.8
> CATEGORIES=	comms astro hamradio
> MASTER_SITES=	http://gnuradio.org/releases/gnuradio/ \
> 		LOCAL/db
>@@ -34,7 +33,11 @@ LIB_DEPENDS=	libcppunit.so:${PORTSDIR}/d
> 		libgsl.so:${PORTSDIR}/math/gsl
> RUN_DEPENDS:=	${BUILD_DEPENDS}
> 
>-USES=		cmake:outsource iconv perl5 python:2.7 shebangfix
>+# 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:outsource compiler:c11 iconv perl5 python:2.7 shebangfix
> SHEBANG_FILES=	grc/freedesktop/grc_setup_freedesktop.in
> CMAKE_ARGS+=	-DSWIG_EXECUTABLE:STRING="${LOCALBASE}/bin/swig2.0"
> CMAKE_ARGS+=	-DICONV_PREFIX:STRING="${ICONV_PREFIX}" \
>@@ -42,7 +45,7 @@ CMAKE_ARGS+=	-DICONV_PREFIX:STRING="${IC
> 		-DENABLE_GR_CTRLPORT="YES"
> # for detailed debugging uncomment the next two lines as needed
> #CMAKE_ARGS+=	--debug-output --trace
>-MAJOR_SUB_VER=	3.7.7
>+MAJOR_SUB_VER=	3.7.8
> DOCSDIR=	share/doc/${PORTNAME}-${MAJOR_SUB_VER}
> USE_GNOME=	pygtk2
> USE_WX=		3.0+
>@@ -51,6 +54,9 @@ WX_COMPS=	wx wx:build wx:run python:buil
> 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
> 
> OPTIONS_DEFINE=		USRP TESTING
> # Unfortunately building docs on i386 fails
>@@ -58,6 +64,7 @@ OPTIONS_DEFINE=		USRP TESTING
> # Yay. building docs is broken on 10 and HEAD too so turn them all off
> OPTIONS_EXCLUDE=	DOCS
> OPTIONS_DEFAULT=	USRP
>+OPTIONS_SUB=		yes
> USRP_DESC=	Include USRP support (UHD) from Ettus
> TESTING_DESC=	Include testing support
> 
>@@ -84,8 +91,11 @@ TESTING_CMAKE_ON=	-DENABLE_TESTING:STRIN
> TESTING_CMAKE_OFF=	-DENABLE_TESTING:STRING="OFF"
> TESTING_BUILD_DEPENDS=	cppunit-config:${PORTSDIR}/devel/cppunit
> 
>-.include <bsd.port.options.mk>
>+.include <bsd.port.pre.mk>
> 
>+.if ${PORT_OPTIONS:MUSRP}
>+LIBSTRIP_FILES+=	uhd
>+.endif
> .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000
> USE_GCC=	yes
> .endif
>@@ -100,4 +110,9 @@ post-patch:
> 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
> 		${WRKSRC}/cmake/Modules/FindPortaudio.cmake
> 
>-.include <bsd.port.mk>
>+post-install:
>+.for a in ${LIBSTRIP_FILES}
>+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgnuradio-${a}.so.${MAJOR_SUB_VER}
>+.endfor
>+
>+.include <bsd.port.post.mk>
>diff -dpruN /usr/ports/comms/gnuradio/distinfo ./distinfo
>--- /usr/ports/comms/gnuradio/distinfo	2015-07-26 23:00:18.000000000 +0000
>+++ ./distinfo	2015-09-25 00:43:11.000000000 +0000
>@@ -1,2 +1,2 @@
>-SHA256 (gnuradio-3.7.7.1.tar.gz) = 2b27b13fc734ab5882e42c1661d433c0c097fd8b55b682f00626fa96c356584e
>-SIZE (gnuradio-3.7.7.1.tar.gz) = 3845988
>+SHA256 (gnuradio-3.7.8.tar.gz) = fe19cb54b5d77fb76dde61d5cf184c6dee7066779b45c51676bae6e6d0cd4172
>+SIZE (gnuradio-3.7.8.tar.gz) = 3990172
>diff -dpruN /usr/ports/comms/gnuradio/files/patch-CMakeLists.txt ./files/patch-CMakeLists.txt
>--- /usr/ports/comms/gnuradio/files/patch-CMakeLists.txt	2015-07-26 23:00:18.000000000 +0000
>+++ ./files/patch-CMakeLists.txt	2015-09-02 04:43:04.000000000 +0000
>@@ -1,4 +1,4 @@
>---- CMakeLists.txt.orig	2015-05-12 09:39:44 UTC
>+--- CMakeLists.txt.orig	2015-07-25 20:27:13 UTC
> +++ CMakeLists.txt
> @@ -29,6 +29,11 @@ cmake_minimum_required(VERSION 2.6)
>  project(gnuradio CXX C)
>@@ -15,7 +15,7 @@
> @@ -144,6 +149,14 @@ string(REPLACE "\n" " \\n" COMPILER_INFO
>  ########################################################################
>  include(GrPlatform) #define LIB_SUFFIX
>- set(GR_RUNTIME_DIR      bin)
>+ set(GR_RUNTIME_DIR     bin CACHE PATH "Path to install all binaries")
> +########################################################################
> +# FreeBSD libdata vs. lib
> +#
>@@ -24,10 +24,10 @@
> +else()
> +set(GR_PKGCONFIG_DIR      lib${LIB_SUFFIX})
> +endif()
>- set(GR_LIBRARY_DIR      lib${LIB_SUFFIX})
>- set(GR_INCLUDE_DIR      include)
>- set(GR_DATA_DIR         share)
>-@@ -228,6 +241,42 @@ add_custom_target(uninstall
>+ 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")
>+@@ -229,6 +242,42 @@ add_custom_target(uninstall
>  include(GrBoost)
>  
>  ########################################################################
>@@ -70,7 +70,7 @@
>  # Enable python component
>  ########################################################################
>  find_package(PythonLibs 2)
>-@@ -353,11 +402,13 @@ GR_LOGGING()
>+@@ -354,11 +403,13 @@ GR_LOGGING()
>  ########################################################################
>  # Distribute the README file
>  ########################################################################
>diff -dpruN /usr/ports/comms/gnuradio/files/patch-docs_doxygen_Doxyfile.in ./files/patch-docs_doxygen_Doxyfile.in
>--- /usr/ports/comms/gnuradio/files/patch-docs_doxygen_Doxyfile.in	2015-07-26 23:00:18.000000000 +0000
>+++ ./files/patch-docs_doxygen_Doxyfile.in	2015-07-27 23:52:02.000000000 +0000
>@@ -5,7 +5,7 @@
>  # set the path where dot can find it.
>  
> -DOT_FONTPATH           =
>-+DOT_FONTPATH           =	/usr/local/share/fonts/freefont-ttf
>++DOT_FONTPATH           =	%%PREFIX%%/share/fonts/freefont-ttf
>  
>  # If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
>  # will generate a graph for each documented class showing the direct and
>diff -dpruN /usr/ports/comms/gnuradio/files/patch-gr-dtv__lib__dvbt__dvbt_reed_solomon.cc ./files/patch-gr-dtv__lib__dvbt__dvbt_reed_solomon.cc
>--- /usr/ports/comms/gnuradio/files/patch-gr-dtv__lib__dvbt__dvbt_reed_solomon.cc	1970-01-01 00:00:00.000000000 +0000
>+++ ./files/patch-gr-dtv__lib__dvbt__dvbt_reed_solomon.cc	2015-10-02 02:03:43.000000000 +0000
>@@ -0,0 +1,11 @@
>+--- gr-dtv/lib/dvbt/dvbt_reed_solomon.cc.orig	2015-08-05 18:54:39 UTC
>++++ gr-dtv/lib/dvbt/dvbt_reed_solomon.cc
>+@@ -42,7 +42,7 @@ namespace gr {
>+       d_p = p; d_m = m;
>+ 
>+       //maximum number of elements in the GF(p^m)
>+-      int q = powl(p, m);
>++      int q = pow(p, m);
>+ 
>+       d_gf_exp = new unsigned char[q];
>+       if (d_gf_exp == NULL) {
>diff -dpruN /usr/ports/comms/gnuradio/files/patch-volk_tmpl_volk__cpu.tmpl.c ./files/patch-volk_tmpl_volk__cpu.tmpl.c
>--- /usr/ports/comms/gnuradio/files/patch-volk_tmpl_volk__cpu.tmpl.c	2015-07-26 23:00:18.000000000 +0000
>+++ ./files/patch-volk_tmpl_volk__cpu.tmpl.c	2015-10-01 00:45:12.000000000 +0000
>@@ -1,10 +1,13 @@
>---- volk/tmpl/volk_cpu.tmpl.c.orig	2015-05-12 09:39:44 UTC
>+--- volk/tmpl/volk_cpu.tmpl.c.orig	2015-07-09 02:00:33 UTC
> +++ volk/tmpl/volk_cpu.tmpl.c
>-@@ -36,7 +36,31 @@ struct VOLK_CPU volk_cpu;
>-     #if defined(HAVE_CPUID_H)
>-         #include <cpuid.h>
>-     #else
>--        #include "gcc_x86_cpuid.h"
>+@@ -34,7 +34,35 @@ struct VOLK_CPU volk_cpu;
>+ 
>+ //implement get cpuid for gcc compilers using a system or local copy of cpuid.h
>+ #if defined(__GNUC__)
>+-    #include <cpuid.h>
>++    #if defined(HAVE_CPUID_H)
>++        #include <cpuid.h>
>++    #else
> +	#ifdef __FreeBSD__
> +#if __i386__
> +#define __cpuid(__level, __eax, __ebx, __ecx, __edx) \
>@@ -30,6 +33,7 @@
> +	#else
> +	        #include "gcc_x86_cpuid.h"
> +	#endif
>-     #endif
>++    #endif
>      #define cpuid_x86(op, r) __get_cpuid(op, (unsigned int *)r+0, (unsigned int *)r+1, (unsigned int *)r+2, (unsigned int *)r+3)
>  
>+     /* Return Intel AVX extended CPU capabilities register.
>diff -dpruN /usr/ports/comms/gnuradio/pkg-plist ./pkg-plist
>--- /usr/ports/comms/gnuradio/pkg-plist	2015-07-26 23:00:18.000000000 +0000
>+++ ./pkg-plist	2015-10-01 07:10:36.000000000 +0000
>@@ -1,8 +1,14 @@
> %%QT_BINDIR%%/gnuradio-companion
> %%QT_BINDIR%%/gnuradio-config-info
> %%QT_BINDIR%%/gr_constellation_plot
>+%%QT_BINDIR%%/gr-ctrlport-monitor
>+%%QT_BINDIR%%/gr-ctrlport-monitorc
>+%%QT_BINDIR%%/gr-ctrlport-monitoro
> %%QT_BINDIR%%/gr_filter_design
> %%QT_BINDIR%%/gr_modtool
>+%%QT_BINDIR%%/gr-perf-monitorx
>+%%QT_BINDIR%%/gr-perf-monitorxc
>+%%QT_BINDIR%%/gr-perf-monitorxo
> %%QT_BINDIR%%/gr_plot_char
> %%QT_BINDIR%%/gr_plot_const
> %%QT_BINDIR%%/gr_plot_fft
>@@ -36,11 +42,11 @@
> %%QT_BINDIR%%/gr_time_raster_b
> %%QT_BINDIR%%/gr_time_raster_f
> %%QT_BINDIR%%/grcc
>-%%QT_BINDIR%%/uhd_fft
>-%%QT_BINDIR%%/uhd_rx_cfile
>-%%QT_BINDIR%%/uhd_rx_nogui
>-%%QT_BINDIR%%/uhd_siggen
>-%%QT_BINDIR%%/uhd_siggen_gui
>+%%USRP%%%%QT_BINDIR%%/uhd_fft
>+%%USRP%%%%QT_BINDIR%%/uhd_rx_cfile
>+%%USRP%%%%QT_BINDIR%%/uhd_rx_nogui
>+%%USRP%%%%QT_BINDIR%%/uhd_siggen
>+%%USRP%%%%QT_BINDIR%%/uhd_siggen_gui
> %%QT_BINDIR%%/usrp_flex
> %%QT_BINDIR%%/usrp_flex_all
> %%QT_BINDIR%%/usrp_flex_band
>@@ -48,20 +54,20 @@
> %%QT_BINDIR%%/volk_modtool
> %%QT_BINDIR%%/volk_profile
> %%ETCDIR%%/conf.d/gnuradio-runtime.conf
>-%%ETCDIR%%/conf.d/gr-audio-alsa.conf.sample
>-%%ETCDIR%%/conf.d/gr-audio-jack.conf.sample
>-%%ETCDIR%%/conf.d/gr-audio-oss.conf.sample
>-%%ETCDIR%%/conf.d/gr-audio-portaudio.conf.sample
>-%%ETCDIR%%/conf.d/gr-audio.conf.sample
>-%%ETCDIR%%/conf.d/gr-qtgui.conf.sample
>-%%ETCDIR%%/conf.d/gr-wxgui.conf.sample
>-%%ETCDIR%%/conf.d/grc.conf.sample
>-%%ETCDIR%%/conf.d/modtool.conf.sample
>+@sample %%ETCDIR%%/conf.d/gr-audio-alsa.conf.sample
>+@sample %%ETCDIR%%/conf.d/gr-audio-jack.conf.sample
>+@sample %%ETCDIR%%/conf.d/gr-audio-oss.conf.sample
>+@sample %%ETCDIR%%/conf.d/gr-audio-portaudio.conf.sample
>+@sample %%ETCDIR%%/conf.d/gr-audio.conf.sample
>+@sample %%ETCDIR%%/conf.d/gr-qtgui.conf.sample
>+@sample %%ETCDIR%%/conf.d/gr-wxgui.conf.sample
>+@sample %%ETCDIR%%/conf.d/grc.conf.sample
>+@sample %%ETCDIR%%/conf.d/modtool.conf.sample
> 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
>@@ -104,7 +110,7 @@ include/gnuradio/api.h
> include/gnuradio/atsc/CMakeLists.txt
> include/gnuradio/atsc/GrAtscBitTimingLoop.h
> include/gnuradio/atsc/GrAtscBitTimingLoop2.h
>-include/gnuradio/atsc/GrAtscBitTimingLoop%%MAJOR_VERSION%%.h
>+include/gnuradio/atsc/GrAtscBitTimingLoop3.h
> include/gnuradio/atsc/GrAtscConvert2xTo20.h
> include/gnuradio/atsc/GrAtscDataSegToSoftDataSeg.h
> include/gnuradio/atsc/GrAtscDeinterleaver.h
>@@ -216,11 +222,11 @@ 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/%%QT_BINDIR%%_statistics_f.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
>@@ -269,8 +275,8 @@ include/gnuradio/blocks/interleaved_shor
> 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/max_ff.h
> include/gnuradio/blocks/max_ii.h
>@@ -432,7 +438,9 @@ include/gnuradio/config.h
> include/gnuradio/constants.h
> include/gnuradio/digital/additive_scrambler_bb.h
> include/gnuradio/digital/api.h
>-include/gnuradio/digital/%%QT_BINDIR%%ary_slicer_fb.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
>@@ -446,6 +454,7 @@ include/gnuradio/digital/constellation.h
> include/gnuradio/digital/constellation_decoder_cb.h
> include/gnuradio/digital/constellation_receiver_cb.h
> include/gnuradio/digital/constellation_soft_decoder_cf.h
>+include/gnuradio/digital/corr_est_cc.h
> include/gnuradio/digital/correlate_access_code_bb.h
> include/gnuradio/digital/correlate_access_code_bb_ts.h
> include/gnuradio/digital/correlate_access_code_ff_ts.h
>@@ -453,9 +462,9 @@ include/gnuradio/digital/correlate_acces
> 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
>@@ -473,9 +482,11 @@ include/gnuradio/digital/lfsr.h
> 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
> include/gnuradio/digital/ofdm_carrier_allocator_cvc.h
> include/gnuradio/digital/ofdm_chanest_vcvc.h
> include/gnuradio/digital/ofdm_cyclic_prefixer.h
>@@ -530,6 +541,15 @@ include/gnuradio/dtv/dvbs2_config.h
> include/gnuradio/dtv/dvbs2_interleaver_bb.h
> include/gnuradio/dtv/dvbs2_modulator_bc.h
> include/gnuradio/dtv/dvbs2_physical_cc.h
>+include/gnuradio/dtv/dvbt_bit_inner_interleaver.h
>+include/gnuradio/dtv/dvbt_config.h
>+include/gnuradio/dtv/dvbt_convolutional_interleaver.h
>+include/gnuradio/dtv/dvbt_energy_dispersal.h
>+include/gnuradio/dtv/dvbt_inner_coder.h
>+include/gnuradio/dtv/dvbt_map.h
>+include/gnuradio/dtv/dvbt_reed_solomon_enc.h
>+include/gnuradio/dtv/dvbt_reference_signals.h
>+include/gnuradio/dtv/dvbt_symbol_inner_interleaver.h
> include/gnuradio/dtv/dvbt2_cellinterleaver_cc.h
> include/gnuradio/dtv/dvbt2_config.h
> include/gnuradio/dtv/dvbt2_framemapper_cc.h
>@@ -548,6 +568,7 @@ include/gnuradio/fec/api.h
> include/gnuradio/fec/async_decoder.h
> include/gnuradio/fec/async_encoder.h
> include/gnuradio/fec/ber_bf.h
>+include/gnuradio/fec/cc_common.h
> include/gnuradio/fec/cc_decoder.h
> include/gnuradio/fec/cc_encoder.h
> include/gnuradio/fec/ccsds_encoder.h
>@@ -755,8 +776,8 @@ include/gnuradio/swig/blocks_swig1.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
>@@ -817,8 +838,8 @@ include/gnuradio/swig/tags.i
> include/gnuradio/swig/top_block.i
> include/gnuradio/swig/trellis_swig.i
> include/gnuradio/swig/trellis_swig_doc.i
>-include/gnuradio/swig/uhd_swig.i
>-include/gnuradio/swig/uhd_swig_doc.i
>+%%USRP%%include/gnuradio/swig/uhd_swig.i
>+%%USRP%%include/gnuradio/swig/uhd_swig_doc.i
> include/gnuradio/swig/video_sdl_swig.i
> include/gnuradio/swig/video_sdl_swig_doc.i
> include/gnuradio/swig/vocoder_swig.i
>@@ -858,12 +879,12 @@ include/gnuradio/trellis/metrics_f.h
> include/gnuradio/trellis/metrics_i.h
> include/gnuradio/trellis/metrics_s.h
> include/gnuradio/trellis/pccc_decoder_b.h
>-include/gnuradio/trellis/pccc_decoder_com%%QT_BINDIR%%ed_cb.h
>-include/gnuradio/trellis/pccc_decoder_com%%QT_BINDIR%%ed_ci.h
>-include/gnuradio/trellis/pccc_decoder_com%%QT_BINDIR%%ed_cs.h
>-include/gnuradio/trellis/pccc_decoder_com%%QT_BINDIR%%ed_fb.h
>-include/gnuradio/trellis/pccc_decoder_com%%QT_BINDIR%%ed_fi.h
>-include/gnuradio/trellis/pccc_decoder_com%%QT_BINDIR%%ed_fs.h
>+include/gnuradio/trellis/pccc_decoder_combined_cb.h
>+include/gnuradio/trellis/pccc_decoder_combined_ci.h
>+include/gnuradio/trellis/pccc_decoder_combined_cs.h
>+include/gnuradio/trellis/pccc_decoder_combined_fb.h
>+include/gnuradio/trellis/pccc_decoder_combined_fi.h
>+include/gnuradio/trellis/pccc_decoder_combined_fs.h
> include/gnuradio/trellis/pccc_decoder_i.h
> include/gnuradio/trellis/pccc_decoder_s.h
> include/gnuradio/trellis/pccc_encoder_bb.h
>@@ -875,12 +896,12 @@ include/gnuradio/trellis/pccc_encoder_ss
> include/gnuradio/trellis/permutation.h
> include/gnuradio/trellis/quicksort_index.h
> include/gnuradio/trellis/sccc_decoder_b.h
>-include/gnuradio/trellis/sccc_decoder_com%%QT_BINDIR%%ed_cb.h
>-include/gnuradio/trellis/sccc_decoder_com%%QT_BINDIR%%ed_ci.h
>-include/gnuradio/trellis/sccc_decoder_com%%QT_BINDIR%%ed_cs.h
>-include/gnuradio/trellis/sccc_decoder_com%%QT_BINDIR%%ed_fb.h
>-include/gnuradio/trellis/sccc_decoder_com%%QT_BINDIR%%ed_fi.h
>-include/gnuradio/trellis/sccc_decoder_com%%QT_BINDIR%%ed_fs.h
>+include/gnuradio/trellis/sccc_decoder_combined_cb.h
>+include/gnuradio/trellis/sccc_decoder_combined_ci.h
>+include/gnuradio/trellis/sccc_decoder_combined_cs.h
>+include/gnuradio/trellis/sccc_decoder_combined_fb.h
>+include/gnuradio/trellis/sccc_decoder_combined_fi.h
>+include/gnuradio/trellis/sccc_decoder_combined_fs.h
> include/gnuradio/trellis/sccc_decoder_i.h
> include/gnuradio/trellis/sccc_decoder_s.h
> include/gnuradio/trellis/sccc_encoder_bb.h
>@@ -889,29 +910,30 @@ include/gnuradio/trellis/sccc_encoder_bs
> include/gnuradio/trellis/sccc_encoder_ii.h
> include/gnuradio/trellis/sccc_encoder_si.h
> include/gnuradio/trellis/sccc_encoder_ss.h
>-include/gnuradio/trellis/siso_com%%QT_BINDIR%%ed_f.h
>+include/gnuradio/trellis/siso_combined_f.h
> include/gnuradio/trellis/siso_f.h
> include/gnuradio/trellis/siso_type.h
> include/gnuradio/trellis/viterbi_b.h
>-include/gnuradio/trellis/viterbi_com%%QT_BINDIR%%ed_cb.h
>-include/gnuradio/trellis/viterbi_com%%QT_BINDIR%%ed_ci.h
>-include/gnuradio/trellis/viterbi_com%%QT_BINDIR%%ed_cs.h
>-include/gnuradio/trellis/viterbi_com%%QT_BINDIR%%ed_fb.h
>-include/gnuradio/trellis/viterbi_com%%QT_BINDIR%%ed_fi.h
>-include/gnuradio/trellis/viterbi_com%%QT_BINDIR%%ed_fs.h
>-include/gnuradio/trellis/viterbi_com%%QT_BINDIR%%ed_ib.h
>-include/gnuradio/trellis/viterbi_com%%QT_BINDIR%%ed_ii.h
>-include/gnuradio/trellis/viterbi_com%%QT_BINDIR%%ed_is.h
>-include/gnuradio/trellis/viterbi_com%%QT_BINDIR%%ed_sb.h
>-include/gnuradio/trellis/viterbi_com%%QT_BINDIR%%ed_si.h
>-include/gnuradio/trellis/viterbi_com%%QT_BINDIR%%ed_ss.h
>+include/gnuradio/trellis/viterbi_combined_cb.h
>+include/gnuradio/trellis/viterbi_combined_ci.h
>+include/gnuradio/trellis/viterbi_combined_cs.h
>+include/gnuradio/trellis/viterbi_combined_fb.h
>+include/gnuradio/trellis/viterbi_combined_fi.h
>+include/gnuradio/trellis/viterbi_combined_fs.h
>+include/gnuradio/trellis/viterbi_combined_ib.h
>+include/gnuradio/trellis/viterbi_combined_ii.h
>+include/gnuradio/trellis/viterbi_combined_is.h
>+include/gnuradio/trellis/viterbi_combined_sb.h
>+include/gnuradio/trellis/viterbi_combined_si.h
>+include/gnuradio/trellis/viterbi_combined_ss.h
> include/gnuradio/trellis/viterbi_i.h
> include/gnuradio/trellis/viterbi_s.h
> include/gnuradio/types.h
>-include/gnuradio/uhd/amsg_source.h
>-include/gnuradio/uhd/api.h
>-include/gnuradio/uhd/usrp_sink.h
>-include/gnuradio/uhd/usrp_source.h
>+%%USRP%%include/gnuradio/uhd/amsg_source.h
>+%%USRP%%include/gnuradio/uhd/api.h
>+%%USRP%%include/gnuradio/uhd/usrp_block.h
>+%%USRP%%include/gnuradio/uhd/usrp_sink.h
>+%%USRP%%include/gnuradio/uhd/usrp_source.h
> include/gnuradio/unittests.h
> include/gnuradio/video_sdl/api.h
> include/gnuradio/video_sdl/sink_s.h
>@@ -926,10 +948,10 @@ include/gnuradio/vocoder/cvsd_decode_bs.
> include/gnuradio/vocoder/cvsd_encode_sb.h
> include/gnuradio/vocoder/g721_decode_bs.h
> include/gnuradio/vocoder/g721_encode_sb.h
>-include/gnuradio/vocoder/g72%%MAJOR_VERSION%%_24_decode_bs.h
>-include/gnuradio/vocoder/g72%%MAJOR_VERSION%%_24_encode_sb.h
>-include/gnuradio/vocoder/g72%%MAJOR_VERSION%%_40_decode_bs.h
>-include/gnuradio/vocoder/g72%%MAJOR_VERSION%%_40_encode_sb.h
>+include/gnuradio/vocoder/g723_24_decode_bs.h
>+include/gnuradio/vocoder/g723_24_encode_sb.h
>+include/gnuradio/vocoder/g723_40_decode_bs.h
>+include/gnuradio/vocoder/g723_40_encode_sb.h
> include/gnuradio/vocoder/gsm_fr_decode_ps.h
> include/gnuradio/vocoder/gsm_fr_encode_sp.h
> include/gnuradio/vocoder/ulaw_decode_bs.h
>@@ -950,97 +972,98 @@ include/pmt/pmt_pool.h
> include/pmt/pmt_serial_tags.h
> include/pmt/pmt_sugar.h
> include/volk/volk.h
>-include/volk/volk_16i_%%MAJOR_VERSION%%2fc_dot_prod_%%MAJOR_VERSION%%2fc.h
>+include/volk/volk_16i_32fc_dot_prod_32fc.h
> include/volk/volk_16i_branch_4_state_8.h
> include/volk/volk_16i_convert_8i.h
> include/volk/volk_16i_max_star_16i.h
> include/volk/volk_16i_max_star_horizontal_16i.h
> include/volk/volk_16i_permute_and_scalar_add.h
>-include/volk/volk_16i_s%%MAJOR_VERSION%%2f_convert_%%MAJOR_VERSION%%2f.h
>+include/volk/volk_16i_s32f_convert_32f.h
> include/volk/volk_16i_x4_quad_max_star_16i.h
> include/volk/volk_16i_x5_add_quad_16i_x4.h
> include/volk/volk_16ic_deinterleave_16i_x2.h
> include/volk/volk_16ic_deinterleave_real_16i.h
> include/volk/volk_16ic_deinterleave_real_8i.h
> include/volk/volk_16ic_magnitude_16i.h
>-include/volk/volk_16ic_s%%MAJOR_VERSION%%2f_deinterleave_%%MAJOR_VERSION%%2f_x2.h
>-include/volk/volk_16ic_s%%MAJOR_VERSION%%2f_deinterleave_real_%%MAJOR_VERSION%%2f.h
>-include/volk/volk_16ic_s%%MAJOR_VERSION%%2f_magnitude_%%MAJOR_VERSION%%2f.h
>+include/volk/volk_16ic_s32f_deinterleave_32f_x2.h
>+include/volk/volk_16ic_s32f_deinterleave_real_32f.h
>+include/volk/volk_16ic_s32f_magnitude_32f.h
> include/volk/volk_16u_byteswap.h
> include/volk/volk_16u_byteswappuppet_16u.h
>-include/volk/volk_%%MAJOR_VERSION%%2f_accumulator_s%%MAJOR_VERSION%%2f.h
>-include/volk/volk_%%MAJOR_VERSION%%2f_acos_%%MAJOR_VERSION%%2f.h
>-include/volk/volk_%%MAJOR_VERSION%%2f_asin_%%MAJOR_VERSION%%2f.h
>-include/volk/volk_%%MAJOR_VERSION%%2f_atan_%%MAJOR_VERSION%%2f.h
>-include/volk/volk_%%MAJOR_VERSION%%2f_%%QT_BINDIR%%ary_slicer_%%MAJOR_VERSION%%2i.h
>-include/volk/volk_%%MAJOR_VERSION%%2f_%%QT_BINDIR%%ary_slicer_8i.h
>-include/volk/volk_%%MAJOR_VERSION%%2f_convert_64f.h
>-include/volk/volk_%%MAJOR_VERSION%%2f_cos_%%MAJOR_VERSION%%2f.h
>-include/volk/volk_%%MAJOR_VERSION%%2f_expfast_%%MAJOR_VERSION%%2f.h
>-include/volk/volk_%%MAJOR_VERSION%%2f_index_max_16u.h
>-include/volk/volk_%%MAJOR_VERSION%%2f_invsqrt_%%MAJOR_VERSION%%2f.h
>-include/volk/volk_%%MAJOR_VERSION%%2f_log2_%%MAJOR_VERSION%%2f.h
>-include/volk/volk_%%MAJOR_VERSION%%2f_null_%%MAJOR_VERSION%%2f.h
>-include/volk/volk_%%MAJOR_VERSION%%2f_s%%MAJOR_VERSION%%2f_%%MAJOR_VERSION%%2f_fm_detect_%%MAJOR_VERSION%%2f.h
>-include/volk/volk_%%MAJOR_VERSION%%2f_s%%MAJOR_VERSION%%2f_calc_spectral_noise_floor_%%MAJOR_VERSION%%2f.h
>-include/volk/volk_%%MAJOR_VERSION%%2f_s%%MAJOR_VERSION%%2f_convert_16i.h
>-include/volk/volk_%%MAJOR_VERSION%%2f_s%%MAJOR_VERSION%%2f_convert_%%MAJOR_VERSION%%2i.h
>-include/volk/volk_%%MAJOR_VERSION%%2f_s%%MAJOR_VERSION%%2f_convert_8i.h
>-include/volk/volk_%%MAJOR_VERSION%%2f_s%%MAJOR_VERSION%%2f_multiply_%%MAJOR_VERSION%%2f.h
>-include/volk/volk_%%MAJOR_VERSION%%2f_s%%MAJOR_VERSION%%2f_normalize.h
>-include/volk/volk_%%MAJOR_VERSION%%2f_s%%MAJOR_VERSION%%2f_power_%%MAJOR_VERSION%%2f.h
>-include/volk/volk_%%MAJOR_VERSION%%2f_s%%MAJOR_VERSION%%2f_stddev_%%MAJOR_VERSION%%2f.h
>-include/volk/volk_%%MAJOR_VERSION%%2f_sin_%%MAJOR_VERSION%%2f.h
>-include/volk/volk_%%MAJOR_VERSION%%2f_sqrt_%%MAJOR_VERSION%%2f.h
>-include/volk/volk_%%MAJOR_VERSION%%2f_stddev_and_mean_%%MAJOR_VERSION%%2f_x2.h
>-include/volk/volk_%%MAJOR_VERSION%%2f_tan_%%MAJOR_VERSION%%2f.h
>-include/volk/volk_%%MAJOR_VERSION%%2f_tanh_%%MAJOR_VERSION%%2f.h
>-include/volk/volk_%%MAJOR_VERSION%%2f_x2_add_%%MAJOR_VERSION%%2f.h
>-include/volk/volk_%%MAJOR_VERSION%%2f_x2_divide_%%MAJOR_VERSION%%2f.h
>-include/volk/volk_%%MAJOR_VERSION%%2f_x2_dot_prod_16i.h
>-include/volk/volk_%%MAJOR_VERSION%%2f_x2_dot_prod_%%MAJOR_VERSION%%2f.h
>-include/volk/volk_%%MAJOR_VERSION%%2f_x2_interleave_%%MAJOR_VERSION%%2fc.h
>-include/volk/volk_%%MAJOR_VERSION%%2f_x2_max_%%MAJOR_VERSION%%2f.h
>-include/volk/volk_%%MAJOR_VERSION%%2f_x2_min_%%MAJOR_VERSION%%2f.h
>-include/volk/volk_%%MAJOR_VERSION%%2f_x2_multiply_%%MAJOR_VERSION%%2f.h
>-include/volk/volk_%%MAJOR_VERSION%%2f_x2_pow_%%MAJOR_VERSION%%2f.h
>-include/volk/volk_%%MAJOR_VERSION%%2f_x2_s%%MAJOR_VERSION%%2f_interleave_16ic.h
>-include/volk/volk_%%MAJOR_VERSION%%2f_x2_subtract_%%MAJOR_VERSION%%2f.h
>-include/volk/volk_%%MAJOR_VERSION%%2f_x%%MAJOR_VERSION%%_sum_of_poly_%%MAJOR_VERSION%%2f.h
>-include/volk/volk_%%MAJOR_VERSION%%2fc_%%MAJOR_VERSION%%2f_dot_prod_%%MAJOR_VERSION%%2fc.h
>-include/volk/volk_%%MAJOR_VERSION%%2fc_%%MAJOR_VERSION%%2f_multiply_%%MAJOR_VERSION%%2fc.h
>-include/volk/volk_%%MAJOR_VERSION%%2fc_conjugate_%%MAJOR_VERSION%%2fc.h
>-include/volk/volk_%%MAJOR_VERSION%%2fc_deinterleave_%%MAJOR_VERSION%%2f_x2.h
>-include/volk/volk_%%MAJOR_VERSION%%2fc_deinterleave_64f_x2.h
>-include/volk/volk_%%MAJOR_VERSION%%2fc_deinterleave_imag_%%MAJOR_VERSION%%2f.h
>-include/volk/volk_%%MAJOR_VERSION%%2fc_deinterleave_real_%%MAJOR_VERSION%%2f.h
>-include/volk/volk_%%MAJOR_VERSION%%2fc_deinterleave_real_64f.h
>-include/volk/volk_%%MAJOR_VERSION%%2fc_index_max_16u.h
>-include/volk/volk_%%MAJOR_VERSION%%2fc_magnitude_%%MAJOR_VERSION%%2f.h
>-include/volk/volk_%%MAJOR_VERSION%%2fc_magnitude_squared_%%MAJOR_VERSION%%2f.h
>-include/volk/volk_%%MAJOR_VERSION%%2fc_s%%MAJOR_VERSION%%2f_atan2_%%MAJOR_VERSION%%2f.h
>-include/volk/volk_%%MAJOR_VERSION%%2fc_s%%MAJOR_VERSION%%2f_deinterleave_real_16i.h
>-include/volk/volk_%%MAJOR_VERSION%%2fc_s%%MAJOR_VERSION%%2f_magnitude_16i.h
>-include/volk/volk_%%MAJOR_VERSION%%2fc_s%%MAJOR_VERSION%%2f_power_%%MAJOR_VERSION%%2fc.h
>-include/volk/volk_%%MAJOR_VERSION%%2fc_s%%MAJOR_VERSION%%2f_power_spectrum_%%MAJOR_VERSION%%2f.h
>-include/volk/volk_%%MAJOR_VERSION%%2fc_s%%MAJOR_VERSION%%2f_x2_power_spectral_density_%%MAJOR_VERSION%%2f.h
>-include/volk/volk_%%MAJOR_VERSION%%2fc_s%%MAJOR_VERSION%%2fc_multiply_%%MAJOR_VERSION%%2fc.h
>-include/volk/volk_%%MAJOR_VERSION%%2fc_s%%MAJOR_VERSION%%2fc_rotatorpuppet_%%MAJOR_VERSION%%2fc.h
>-include/volk/volk_%%MAJOR_VERSION%%2fc_s%%MAJOR_VERSION%%2fc_x2_rotator_%%MAJOR_VERSION%%2fc.h
>-include/volk/volk_%%MAJOR_VERSION%%2fc_x2_conjugate_dot_prod_%%MAJOR_VERSION%%2fc.h
>-include/volk/volk_%%MAJOR_VERSION%%2fc_x2_dot_prod_%%MAJOR_VERSION%%2fc.h
>-include/volk/volk_%%MAJOR_VERSION%%2fc_x2_multiply_%%MAJOR_VERSION%%2fc.h
>-include/volk/volk_%%MAJOR_VERSION%%2fc_x2_multiply_conjugate_%%MAJOR_VERSION%%2fc.h
>-include/volk/volk_%%MAJOR_VERSION%%2fc_x2_s%%MAJOR_VERSION%%2f_square_dist_scalar_mult_%%MAJOR_VERSION%%2f.h
>-include/volk/volk_%%MAJOR_VERSION%%2fc_x2_square_dist_%%MAJOR_VERSION%%2f.h
>-include/volk/volk_%%MAJOR_VERSION%%2i_s%%MAJOR_VERSION%%2f_convert_%%MAJOR_VERSION%%2f.h
>-include/volk/volk_%%MAJOR_VERSION%%2i_x2_and_%%MAJOR_VERSION%%2i.h
>-include/volk/volk_%%MAJOR_VERSION%%2i_x2_or_%%MAJOR_VERSION%%2i.h
>-include/volk/volk_%%MAJOR_VERSION%%2u_byteswap.h
>-include/volk/volk_%%MAJOR_VERSION%%2u_byteswappuppet_%%MAJOR_VERSION%%2u.h
>-include/volk/volk_%%MAJOR_VERSION%%2u_popcnt.h
>-include/volk/volk_%%MAJOR_VERSION%%2u_popcntpuppet_%%MAJOR_VERSION%%2u.h
>-include/volk/volk_64f_convert_%%MAJOR_VERSION%%2f.h
>+include/volk/volk_32f_accumulator_s32f.h
>+include/volk/volk_32f_acos_32f.h
>+include/volk/volk_32f_asin_32f.h
>+include/volk/volk_32f_atan_32f.h
>+include/volk/volk_32f_%%QT_BINDIR%%ary_slicer_32i.h
>+include/volk/volk_32f_%%QT_BINDIR%%ary_slicer_8i.h
>+include/volk/volk_32f_convert_64f.h
>+include/volk/volk_32f_cos_32f.h
>+include/volk/volk_32f_expfast_32f.h
>+include/volk/volk_32f_index_max_16u.h
>+include/volk/volk_32f_invsqrt_32f.h
>+include/volk/volk_32f_log2_32f.h
>+include/volk/volk_32f_null_32f.h
>+include/volk/volk_32f_s32f_32f_fm_detect_32f.h
>+include/volk/volk_32f_s32f_calc_spectral_noise_floor_32f.h
>+include/volk/volk_32f_s32f_convert_16i.h
>+include/volk/volk_32f_s32f_convert_32i.h
>+include/volk/volk_32f_s32f_convert_8i.h
>+include/volk/volk_32f_s32f_multiply_32f.h
>+include/volk/volk_32f_s32f_normalize.h
>+include/volk/volk_32f_s32f_power_32f.h
>+include/volk/volk_32f_s32f_stddev_32f.h
>+include/volk/volk_32f_sin_32f.h
>+include/volk/volk_32f_sqrt_32f.h
>+include/volk/volk_32f_stddev_and_mean_32f_x2.h
>+include/volk/volk_32f_tan_32f.h
>+include/volk/volk_32f_tanh_32f.h
>+include/volk/volk_32f_x2_add_32f.h
>+include/volk/volk_32f_x2_divide_32f.h
>+include/volk/volk_32f_x2_dot_prod_16i.h
>+include/volk/volk_32f_x2_dot_prod_32f.h
>+include/volk/volk_32f_x2_fm_detectpuppet_32f.h
>+include/volk/volk_32f_x2_interleave_32fc.h
>+include/volk/volk_32f_x2_max_32f.h
>+include/volk/volk_32f_x2_min_32f.h
>+include/volk/volk_32f_x2_multiply_32f.h
>+include/volk/volk_32f_x2_pow_32f.h
>+include/volk/volk_32f_x2_s32f_interleave_16ic.h
>+include/volk/volk_32f_x2_subtract_32f.h
>+include/volk/volk_32f_x3_sum_of_poly_32f.h
>+include/volk/volk_32fc_32f_dot_prod_32fc.h
>+include/volk/volk_32fc_32f_multiply_32fc.h
>+include/volk/volk_32fc_conjugate_32fc.h
>+include/volk/volk_32fc_deinterleave_32f_x2.h
>+include/volk/volk_32fc_deinterleave_64f_x2.h
>+include/volk/volk_32fc_deinterleave_imag_32f.h
>+include/volk/volk_32fc_deinterleave_real_32f.h
>+include/volk/volk_32fc_deinterleave_real_64f.h
>+include/volk/volk_32fc_index_max_16u.h
>+include/volk/volk_32fc_magnitude_32f.h
>+include/volk/volk_32fc_magnitude_squared_32f.h
>+include/volk/volk_32fc_s32f_atan2_32f.h
>+include/volk/volk_32fc_s32f_deinterleave_real_16i.h
>+include/volk/volk_32fc_s32f_magnitude_16i.h
>+include/volk/volk_32fc_s32f_power_32fc.h
>+include/volk/volk_32fc_s32f_power_spectrum_32f.h
>+include/volk/volk_32fc_s32f_x2_power_spectral_density_32f.h
>+include/volk/volk_32fc_s32fc_multiply_32fc.h
>+include/volk/volk_32fc_s32fc_rotatorpuppet_32fc.h
>+include/volk/volk_32fc_s32fc_x2_rotator_32fc.h
>+include/volk/volk_32fc_x2_conjugate_dot_prod_32fc.h
>+include/volk/volk_32fc_x2_dot_prod_32fc.h
>+include/volk/volk_32fc_x2_multiply_32fc.h
>+include/volk/volk_32fc_x2_multiply_conjugate_32fc.h
>+include/volk/volk_32fc_x2_s32f_square_dist_scalar_mult_32f.h
>+include/volk/volk_32fc_x2_square_dist_32f.h
>+include/volk/volk_32i_s32f_convert_32f.h
>+include/volk/volk_32i_x2_and_32i.h
>+include/volk/volk_32i_x2_or_32i.h
>+include/volk/volk_32u_byteswap.h
>+include/volk/volk_32u_byteswappuppet_32u.h
>+include/volk/volk_32u_popcnt.h
>+include/volk/volk_32u_popcntpuppet_32u.h
>+include/volk/volk_64f_convert_32f.h
> include/volk/volk_64f_x2_max_64f.h
> include/volk/volk_64f_x2_min_64f.h
> include/volk/volk_64u_byteswap.h
>@@ -1048,14 +1071,14 @@ include/volk/volk_64u_byteswappuppet_64u
> include/volk/volk_64u_popcnt.h
> include/volk/volk_64u_popcntpuppet_64u.h
> include/volk/volk_8i_convert_16i.h
>-include/volk/volk_8i_s%%MAJOR_VERSION%%2f_convert_%%MAJOR_VERSION%%2f.h
>+include/volk/volk_8i_s32f_convert_32f.h
> include/volk/volk_8ic_deinterleave_16i_x2.h
> include/volk/volk_8ic_deinterleave_real_16i.h
> include/volk/volk_8ic_deinterleave_real_8i.h
>-include/volk/volk_8ic_s%%MAJOR_VERSION%%2f_deinterleave_%%MAJOR_VERSION%%2f_x2.h
>-include/volk/volk_8ic_s%%MAJOR_VERSION%%2f_deinterleave_real_%%MAJOR_VERSION%%2f.h
>+include/volk/volk_8ic_s32f_deinterleave_32f_x2.h
>+include/volk/volk_8ic_s32f_deinterleave_real_32f.h
> include/volk/volk_8ic_x2_multiply_conjugate_16ic.h
>-include/volk/volk_8ic_x2_s%%MAJOR_VERSION%%2f_multiply_conjugate_%%MAJOR_VERSION%%2fc.h
>+include/volk/volk_8ic_x2_s32f_multiply_conjugate_32fc.h
> include/volk/volk_8u_conv_k7_r2puppet_8u.h
> include/volk/volk_8u_x4_conv_k7_r2_8u.h
> include/volk/volk_common.h
>@@ -1069,7 +1092,7 @@ lib/cmake/gnuradio/CMakeMacroLibtoolFile
> lib/cmake/gnuradio/CMakeParseArgumentsCopy.cmake
> lib/cmake/gnuradio/FindALSA.cmake
> lib/cmake/gnuradio/FindCppUnit.cmake
>-lib/cmake/gnuradio/FindFFTW%%MAJOR_VERSION%%f.cmake
>+lib/cmake/gnuradio/FindFFTW3f.cmake
> lib/cmake/gnuradio/FindGSL.cmake
> lib/cmake/gnuradio/FindGit.cmake
> lib/cmake/gnuradio/FindJack.cmake
>@@ -1079,6 +1102,7 @@ lib/cmake/gnuradio/FindPortaudio.cmake
> lib/cmake/gnuradio/FindQwt.cmake
> lib/cmake/gnuradio/FindSWIG.cmake
> lib/cmake/gnuradio/FindSphinx.cmake
>+lib/cmake/gnuradio/FindThrift.cmake
> lib/cmake/gnuradio/FindUHD.cmake
> lib/cmake/gnuradio/FindUSB.cmake
> lib/cmake/gnuradio/FindZeroMQ.cmake
>@@ -1150,9 +1174,9 @@ lib/libgnuradio-runtime.so.%%MAJOR_SUB_V
> lib/libgnuradio-trellis.so
> lib/libgnuradio-trellis.so.%%MAJOR_VERSION%%
> lib/libgnuradio-trellis.so.%%MAJOR_SUB_VER%%
>-lib/libgnuradio-uhd.so
>-lib/libgnuradio-uhd.so.%%MAJOR_VERSION%%
>-lib/libgnuradio-uhd.so.%%MAJOR_SUB_VER%%
>+%%USRP%%lib/libgnuradio-uhd.so
>+%%USRP%%lib/libgnuradio-uhd.so.%%MAJOR_VERSION%%
>+%%USRP%%lib/libgnuradio-uhd.so.%%MAJOR_SUB_VER%%
> lib/libgnuradio-video-sdl.so
> lib/libgnuradio-video-sdl.so.%%MAJOR_VERSION%%
> lib/libgnuradio-video-sdl.so.%%MAJOR_SUB_VER%%
>@@ -1166,7 +1190,7 @@ lib/libgnuradio-wxgui.so
> lib/libgnuradio-wxgui.so.%%MAJOR_VERSION%%
> lib/libgnuradio-wxgui.so.%%MAJOR_SUB_VER%%
> lib/libvolk.so
>-lib/libvolk.so.1.0
>+lib/libvolk.so.1.0.2
> %%PYTHON_SITELIBDIR%%/gnuradio/__init__.py
> %%PYTHON_SITELIBDIR%%/gnuradio/__init__.pyc
> %%PYTHON_SITELIBDIR%%/gnuradio/__init__.pyo
>@@ -1230,7 +1254,7 @@ lib/libvolk.so.1.0
> %%PYTHON_SITELIBDIR%%/gnuradio/blocks/_blocks_swig0.so
> %%PYTHON_SITELIBDIR%%/gnuradio/blocks/_blocks_swig1.so
> %%PYTHON_SITELIBDIR%%/gnuradio/blocks/_blocks_swig2.so
>-%%PYTHON_SITELIBDIR%%/gnuradio/blocks/_blocks_swig%%MAJOR_VERSION%%.so
>+%%PYTHON_SITELIBDIR%%/gnuradio/blocks/_blocks_swig3.so
> %%PYTHON_SITELIBDIR%%/gnuradio/blocks/_blocks_swig4.so
> %%PYTHON_SITELIBDIR%%/gnuradio/blocks/_blocks_swig5.so
> %%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig.py
>@@ -1245,9 +1269,9 @@ lib/libvolk.so.1.0
> %%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig2.py
> %%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig2.pyc
> %%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig2.pyo
>-%%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig%%MAJOR_VERSION%%.py
>-%%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig%%MAJOR_VERSION%%.pyc
>-%%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig%%MAJOR_VERSION%%.pyo
>+%%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig3.py
>+%%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig3.pyc
>+%%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig3.pyo
> %%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig4.py
> %%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig4.pyc
> %%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig4.pyo
>@@ -1276,9 +1300,9 @@ lib/libvolk.so.1.0
> %%PYTHON_SITELIBDIR%%/gnuradio/channels/distortion_2_gen.py
> %%PYTHON_SITELIBDIR%%/gnuradio/channels/distortion_2_gen.pyc
> %%PYTHON_SITELIBDIR%%/gnuradio/channels/distortion_2_gen.pyo
>-%%PYTHON_SITELIBDIR%%/gnuradio/channels/distortion_%%MAJOR_VERSION%%_gen.py
>-%%PYTHON_SITELIBDIR%%/gnuradio/channels/distortion_%%MAJOR_VERSION%%_gen.pyc
>-%%PYTHON_SITELIBDIR%%/gnuradio/channels/distortion_%%MAJOR_VERSION%%_gen.pyo
>+%%PYTHON_SITELIBDIR%%/gnuradio/channels/distortion_3_gen.py
>+%%PYTHON_SITELIBDIR%%/gnuradio/channels/distortion_3_gen.pyc
>+%%PYTHON_SITELIBDIR%%/gnuradio/channels/distortion_3_gen.pyo
> %%PYTHON_SITELIBDIR%%/gnuradio/channels/impairments.py
> %%PYTHON_SITELIBDIR%%/gnuradio/channels/impairments.pyc
> %%PYTHON_SITELIBDIR%%/gnuradio/channels/impairments.pyo
>@@ -1294,9 +1318,18 @@ lib/libvolk.so.1.0
> %%PYTHON_SITELIBDIR%%/gnuradio/channels/quantizer.py
> %%PYTHON_SITELIBDIR%%/gnuradio/channels/quantizer.pyc
> %%PYTHON_SITELIBDIR%%/gnuradio/channels/quantizer.pyo
>+%%PYTHON_SITELIBDIR%%/gnuradio/ctrlport/GNURadioControlPortClient.py
>+%%PYTHON_SITELIBDIR%%/gnuradio/ctrlport/GNURadioControlPortClient.pyc
>+%%PYTHON_SITELIBDIR%%/gnuradio/ctrlport/GNURadioControlPortClient.pyo
> %%PYTHON_SITELIBDIR%%/gnuradio/ctrlport/GrDataPlotter.py
> %%PYTHON_SITELIBDIR%%/gnuradio/ctrlport/GrDataPlotter.pyc
> %%PYTHON_SITELIBDIR%%/gnuradio/ctrlport/GrDataPlotter.pyo
>+%%PYTHON_SITELIBDIR%%/gnuradio/ctrlport/RPCConnection.py
>+%%PYTHON_SITELIBDIR%%/gnuradio/ctrlport/RPCConnection.pyc
>+%%PYTHON_SITELIBDIR%%/gnuradio/ctrlport/RPCConnection.pyo
>+%%PYTHON_SITELIBDIR%%/gnuradio/ctrlport/__init__.py
>+%%PYTHON_SITELIBDIR%%/gnuradio/ctrlport/__init__.pyc
>+%%PYTHON_SITELIBDIR%%/gnuradio/ctrlport/__init__.pyo
> %%PYTHON_SITELIBDIR%%/gnuradio/ctrlport/icon.png
> %%PYTHON_SITELIBDIR%%/gnuradio/ctrlport/monitor.py
> %%PYTHON_SITELIBDIR%%/gnuradio/ctrlport/monitor.pyc
>@@ -1411,6 +1444,9 @@ lib/libvolk.so.1.0
> %%PYTHON_SITELIBDIR%%/gnuradio/dtv/dtv_swig.py
> %%PYTHON_SITELIBDIR%%/gnuradio/dtv/dtv_swig.pyc
> %%PYTHON_SITELIBDIR%%/gnuradio/dtv/dtv_swig.pyo
>+%%PYTHON_SITELIBDIR%%/gnuradio/eng_arg.py
>+%%PYTHON_SITELIBDIR%%/gnuradio/eng_arg.pyc
>+%%PYTHON_SITELIBDIR%%/gnuradio/eng_arg.pyo
> %%PYTHON_SITELIBDIR%%/gnuradio/eng_notation.py
> %%PYTHON_SITELIBDIR%%/gnuradio/eng_notation.pyc
> %%PYTHON_SITELIBDIR%%/gnuradio/eng_notation.pyo
>@@ -1536,9 +1572,9 @@ lib/libvolk.so.1.0
> %%PYTHON_SITELIBDIR%%/gnuradio/gr/gr_threading.py
> %%PYTHON_SITELIBDIR%%/gnuradio/gr/gr_threading.pyc
> %%PYTHON_SITELIBDIR%%/gnuradio/gr/gr_threading.pyo
>-%%PYTHON_SITELIBDIR%%/gnuradio/gr/gr_threading_2%%MAJOR_VERSION%%.py
>-%%PYTHON_SITELIBDIR%%/gnuradio/gr/gr_threading_2%%MAJOR_VERSION%%.pyc
>-%%PYTHON_SITELIBDIR%%/gnuradio/gr/gr_threading_2%%MAJOR_VERSION%%.pyo
>+%%PYTHON_SITELIBDIR%%/gnuradio/gr/gr_threading_23.py
>+%%PYTHON_SITELIBDIR%%/gnuradio/gr/gr_threading_23.pyc
>+%%PYTHON_SITELIBDIR%%/gnuradio/gr/gr_threading_23.pyo
> %%PYTHON_SITELIBDIR%%/gnuradio/gr/gr_threading_24.py
> %%PYTHON_SITELIBDIR%%/gnuradio/gr/gr_threading_24.pyc
> %%PYTHON_SITELIBDIR%%/gnuradio/gr/gr_threading_24.pyo
>@@ -1888,16 +1924,16 @@ lib/libvolk.so.1.0
> %%PYTHON_SITELIBDIR%%/gnuradio/trellis/trellis_swig.py
> %%PYTHON_SITELIBDIR%%/gnuradio/trellis/trellis_swig.pyc
> %%PYTHON_SITELIBDIR%%/gnuradio/trellis/trellis_swig.pyo
>-%%PYTHON_SITELIBDIR%%/gnuradio/uhd/__init__.py
>-%%PYTHON_SITELIBDIR%%/gnuradio/uhd/__init__.pyc
>-%%PYTHON_SITELIBDIR%%/gnuradio/uhd/__init__.pyo
>-%%PYTHON_SITELIBDIR%%/gnuradio/uhd/_uhd_swig.so
>-%%PYTHON_SITELIBDIR%%/gnuradio/uhd/uhd_siggen_base.py
>-%%PYTHON_SITELIBDIR%%/gnuradio/uhd/uhd_siggen_base.pyc
>-%%PYTHON_SITELIBDIR%%/gnuradio/uhd/uhd_siggen_base.pyo
>-%%PYTHON_SITELIBDIR%%/gnuradio/uhd/uhd_swig.py
>-%%PYTHON_SITELIBDIR%%/gnuradio/uhd/uhd_swig.pyc
>-%%PYTHON_SITELIBDIR%%/gnuradio/uhd/uhd_swig.pyo
>+%%USRP%%%%PYTHON_SITELIBDIR%%/gnuradio/uhd/__init__.py
>+%%USRP%%%%PYTHON_SITELIBDIR%%/gnuradio/uhd/__init__.pyc
>+%%USRP%%%%PYTHON_SITELIBDIR%%/gnuradio/uhd/__init__.pyo
>+%%USRP%%%%PYTHON_SITELIBDIR%%/gnuradio/uhd/_uhd_swig.so
>+%%USRP%%%%PYTHON_SITELIBDIR%%/gnuradio/uhd/uhd_siggen_base.py
>+%%USRP%%%%PYTHON_SITELIBDIR%%/gnuradio/uhd/uhd_siggen_base.pyc
>+%%USRP%%%%PYTHON_SITELIBDIR%%/gnuradio/uhd/uhd_siggen_base.pyo
>+%%USRP%%%%PYTHON_SITELIBDIR%%/gnuradio/uhd/uhd_swig.py
>+%%USRP%%%%PYTHON_SITELIBDIR%%/gnuradio/uhd/uhd_swig.pyc
>+%%USRP%%%%PYTHON_SITELIBDIR%%/gnuradio/uhd/uhd_swig.pyo
> %%PYTHON_SITELIBDIR%%/gnuradio/video_sdl/__init__.py
> %%PYTHON_SITELIBDIR%%/gnuradio/video_sdl/__init__.pyc
> %%PYTHON_SITELIBDIR%%/gnuradio/video_sdl/__init__.pyo
>@@ -2108,19 +2144,15 @@ libdata/pkgconfig/gnuradio-pager.pc
> libdata/pkgconfig/gnuradio-qtgui.pc
> libdata/pkgconfig/gnuradio-runtime.pc
> libdata/pkgconfig/gnuradio-trellis.pc
>-libdata/pkgconfig/gnuradio-uhd.pc
>+%%USRP%%libdata/pkgconfig/gnuradio-uhd.pc
> libdata/pkgconfig/gnuradio-video-sdl.pc
> libdata/pkgconfig/gnuradio-vocoder.pc
> libdata/pkgconfig/gnuradio-wavelet.pc
> libdata/pkgconfig/gr-wxgui.pc
> libdata/pkgconfig/volk.pc
> libexec/gnuradio/grc_setup_freedesktop
>-%%PORTDOCS%%%%DOCSDIR%%/README.analog
>-%%PORTDOCS%%%%DOCSDIR%%/README.blocks
>-%%PORTDOCS%%%%DOCSDIR%%/README.channels
>-%%PORTDOCS%%%%DOCSDIR%%/README.dtv
>-%%PORTDOCS%%%%DOCSDIR%%/README.fec
> %%DATADIR%%/examples/analog/fmtest.py
>+%%DATADIR%%/examples/analog/noise_power.grc
> %%DATADIR%%/examples/atsc/README
> %%DATADIR%%/examples/atsc/atsc_rx.py
> %%DATADIR%%/examples/audio/audio_copy.py
>@@ -2139,6 +2171,7 @@ libexec/gnuradio/grc_setup_freedesktop
> %%DATADIR%%/examples/audio/spectrum_inversion.py
> %%DATADIR%%/examples/audio/test_resampler.py
> %%DATADIR%%/examples/blocks/matrix_multiplexer.grc
>+%%DATADIR%%/examples/blocks/peak_detector2.grc
> %%DATADIR%%/examples/blocks/vector_source_with_tags.grc
> %%DATADIR%%/examples/channels/channel_tone_response.grc
> %%DATADIR%%/examples/channels/demo_gmsk.grc
>@@ -2147,6 +2180,7 @@ libexec/gnuradio/grc_setup_freedesktop
> %%DATADIR%%/examples/channels/demo_quantization.grc
> %%DATADIR%%/examples/channels/demo_spec_an.grc
> %%DATADIR%%/examples/channels/demo_two_tone.grc
>+%%DATADIR%%/examples/digital/burst_shaper.grc
> %%DATADIR%%/examples/digital/demod/ber_simulation.grc
> %%DATADIR%%/examples/digital/demod/constellation_soft_decoder.grc
> %%DATADIR%%/examples/digital/demod/digital_freq_lock.grc
>@@ -2156,6 +2190,7 @@ libexec/gnuradio/grc_setup_freedesktop
> %%DATADIR%%/examples/digital/demod/pam_sync.grc
> %%DATADIR%%/examples/digital/demod/pam_timing.grc
> %%DATADIR%%/examples/digital/demod/test_corr_and_sync.grc
>+%%DATADIR%%/examples/digital/demod/test_corr_est.grc
> %%DATADIR%%/examples/digital/demod/uhd_corr_and_sync_rx.grc
> %%DATADIR%%/examples/digital/demod/uhd_corr_and_sync_tx.grc
> %%DATADIR%%/examples/digital/example_costas.py
>@@ -2189,7 +2224,7 @@ libexec/gnuradio/grc_setup_freedesktop
> %%DATADIR%%/examples/fcd/fcd_fft.grc
> %%DATADIR%%/examples/fcd/fcd_nfm_rx
> %%DATADIR%%/examples/fcd/fcd_nfm_rx.grc
>-%%DATADIR%%/examples/fec/271.127.%%MAJOR_VERSION%%.112
>+%%DATADIR%%/examples/fec/271.127.3.112
> %%DATADIR%%/examples/fec/ber_curve_gen.grc
> %%DATADIR%%/examples/fec/ber_test.grc
> %%DATADIR%%/examples/fec/fecapi_async_decoders.grc
>@@ -2205,6 +2240,7 @@ libexec/gnuradio/grc_setup_freedesktop
> %%DATADIR%%/examples/filter/chirp_channelize.py
> %%DATADIR%%/examples/filter/decimate.py
> %%DATADIR%%/examples/filter/fft_filter_ccc.py
>+%%DATADIR%%/examples/filter/filter_taps.grc
> %%DATADIR%%/examples/filter/fir_filter_ccc.py
> %%DATADIR%%/examples/filter/fir_filter_fff.py
> %%DATADIR%%/examples/filter/gr_filtdes_api.py
>@@ -2222,20 +2258,20 @@ libexec/gnuradio/grc_setup_freedesktop
> %%DATADIR%%/examples/grc/xmlrpc/xmlrpc_client.grc
> %%DATADIR%%/examples/grc/xmlrpc/xmlrpc_client_script.py
> %%DATADIR%%/examples/grc/xmlrpc/xmlrpc_server.grc
>-%%DATADIR%%/examples/hf_explorer/README
>-%%DATADIR%%/examples/hf_explorer/hfx.py
>-%%DATADIR%%/examples/hf_explorer/hfx_help
>-%%DATADIR%%/examples/hf_radio/README.TXT
>-%%DATADIR%%/examples/hf_radio/hfir.sci
>-%%DATADIR%%/examples/hf_radio/input.py
>-%%DATADIR%%/examples/hf_radio/output.py
>-%%DATADIR%%/examples/hf_radio/radio.py
>-%%DATADIR%%/examples/hf_radio/radio.xml
>-%%DATADIR%%/examples/hf_radio/ssb_taps
>-%%DATADIR%%/examples/hf_radio/ssbagc.py
>-%%DATADIR%%/examples/hf_radio/ssbdemod.py
>-%%DATADIR%%/examples/hf_radio/startup.py
>-%%DATADIR%%/examples/hf_radio/ui.py
>+%%USRP%%%%DATADIR%%/examples/hf_explorer/README
>+%%USRP%%%%DATADIR%%/examples/hf_explorer/hfx.py
>+%%USRP%%%%DATADIR%%/examples/hf_explorer/hfx_help
>+%%USRP%%%%DATADIR%%/examples/hf_radio/README.TXT
>+%%USRP%%%%DATADIR%%/examples/hf_radio/hfir.sci
>+%%USRP%%%%DATADIR%%/examples/hf_radio/input.py
>+%%USRP%%%%DATADIR%%/examples/hf_radio/output.py
>+%%USRP%%%%DATADIR%%/examples/hf_radio/radio.py
>+%%USRP%%%%DATADIR%%/examples/hf_radio/radio.xml
>+%%USRP%%%%DATADIR%%/examples/hf_radio/ssb_taps
>+%%USRP%%%%DATADIR%%/examples/hf_radio/ssbagc.py
>+%%USRP%%%%DATADIR%%/examples/hf_radio/ssbdemod.py
>+%%USRP%%%%DATADIR%%/examples/hf_radio/startup.py
>+%%USRP%%%%DATADIR%%/examples/hf_radio/ui.py
> %%DATADIR%%/examples/metadata/file_metadata_sink.grc
> %%DATADIR%%/examples/metadata/file_metadata_source.grc
> %%DATADIR%%/examples/metadata/file_metadata_vector_sink.grc
>@@ -2281,27 +2317,27 @@ libexec/gnuradio/grc_setup_freedesktop
> %%DATADIR%%/examples/trellis/fsm_files/awgn1o2_4.fsm
> %%DATADIR%%/examples/trellis/fsm_files/awgn1o2_4rsc.fsm
> %%DATADIR%%/examples/trellis/fsm_files/awgn1o2_8.fsm
>-%%DATADIR%%/examples/trellis/fsm_files/awgn2o%%MAJOR_VERSION%%_16.fsm
>-%%DATADIR%%/examples/trellis/fsm_files/awgn2o%%MAJOR_VERSION%%_16ungerboeck.fsm
>-%%DATADIR%%/examples/trellis/fsm_files/awgn2o%%MAJOR_VERSION%%_16ungerboecka.fsm
>-%%DATADIR%%/examples/trellis/fsm_files/awgn2o%%MAJOR_VERSION%%_%%MAJOR_VERSION%%2ungerboeck.fsm
>-%%DATADIR%%/examples/trellis/fsm_files/awgn2o%%MAJOR_VERSION%%_%%MAJOR_VERSION%%2ungerboecka.fsm
>-%%DATADIR%%/examples/trellis/fsm_files/awgn2o%%MAJOR_VERSION%%_4.fsm
>-%%DATADIR%%/examples/trellis/fsm_files/awgn2o%%MAJOR_VERSION%%_4_msb.fsm
>-%%DATADIR%%/examples/trellis/fsm_files/awgn2o%%MAJOR_VERSION%%_4_msbG.fsm
>-%%DATADIR%%/examples/trellis/fsm_files/awgn2o%%MAJOR_VERSION%%_4ungerboeck.fsm
>-%%DATADIR%%/examples/trellis/fsm_files/awgn2o%%MAJOR_VERSION%%_4ungerboecka.fsm
>-%%DATADIR%%/examples/trellis/fsm_files/awgn2o%%MAJOR_VERSION%%_64ungerboeck.fsm
>-%%DATADIR%%/examples/trellis/fsm_files/awgn2o%%MAJOR_VERSION%%_64ungerboecka.fsm
>-%%DATADIR%%/examples/trellis/fsm_files/awgn2o%%MAJOR_VERSION%%_8.fsm
>-%%DATADIR%%/examples/trellis/fsm_files/awgn2o%%MAJOR_VERSION%%_8ungerboeck.fsm
>-%%DATADIR%%/examples/trellis/fsm_files/awgn2o%%MAJOR_VERSION%%_8ungerboecka.fsm
>+%%DATADIR%%/examples/trellis/fsm_files/awgn2o3_16.fsm
>+%%DATADIR%%/examples/trellis/fsm_files/awgn2o3_16ungerboeck.fsm
>+%%DATADIR%%/examples/trellis/fsm_files/awgn2o3_16ungerboecka.fsm
>+%%DATADIR%%/examples/trellis/fsm_files/awgn2o3_32ungerboeck.fsm
>+%%DATADIR%%/examples/trellis/fsm_files/awgn2o3_32ungerboecka.fsm
>+%%DATADIR%%/examples/trellis/fsm_files/awgn2o3_4.fsm
>+%%DATADIR%%/examples/trellis/fsm_files/awgn2o3_4_msb.fsm
>+%%DATADIR%%/examples/trellis/fsm_files/awgn2o3_4_msbG.fsm
>+%%DATADIR%%/examples/trellis/fsm_files/awgn2o3_4ungerboeck.fsm
>+%%DATADIR%%/examples/trellis/fsm_files/awgn2o3_4ungerboecka.fsm
>+%%DATADIR%%/examples/trellis/fsm_files/awgn2o3_64ungerboeck.fsm
>+%%DATADIR%%/examples/trellis/fsm_files/awgn2o3_64ungerboecka.fsm
>+%%DATADIR%%/examples/trellis/fsm_files/awgn2o3_8.fsm
>+%%DATADIR%%/examples/trellis/fsm_files/awgn2o3_8ungerboeck.fsm
>+%%DATADIR%%/examples/trellis/fsm_files/awgn2o3_8ungerboecka.fsm
> %%DATADIR%%/examples/trellis/fsm_files/awgn2o4_4.fsm
> %%DATADIR%%/examples/trellis/fsm_files/disconnected.fsm
> %%DATADIR%%/examples/trellis/fsm_files/irregular.fsm
> %%DATADIR%%/examples/trellis/fsm_files/joint_16_16.fsm
> %%DATADIR%%/examples/trellis/fsm_files/joint_4_16.fsm
>-%%DATADIR%%/examples/trellis/fsm_files/rep%%MAJOR_VERSION%%.fsm
>+%%DATADIR%%/examples/trellis/fsm_files/rep3.fsm
> %%DATADIR%%/examples/trellis/fsm_files/rep5.fsm
> %%DATADIR%%/examples/trellis/fsm_files/simple.fsm
> %%DATADIR%%/examples/trellis/fsm_files/uncoded4.fsm
>@@ -2314,36 +2350,36 @@ libexec/gnuradio/grc_setup_freedesktop
> %%DATADIR%%/examples/trellis/test_tcm.py
> %%DATADIR%%/examples/trellis/turbo_equalization.grc
> %%DATADIR%%/examples/trellis/viterbi_equalization.grc
>-%%DATADIR%%/examples/uhd/fm_tx4.py
>-%%DATADIR%%/examples/uhd/fm_tx_2_daughterboards.py
>-%%DATADIR%%/examples/uhd/max_power.py
>-%%DATADIR%%/examples/uhd/tags_demo
>-%%DATADIR%%/examples/uhd/uhd_const_wave.grc
>-%%DATADIR%%/examples/uhd/uhd_dpsk_mod.grc
>-%%DATADIR%%/examples/uhd/uhd_fft.grc
>-%%DATADIR%%/examples/uhd/uhd_rx_dpsk.grc
>-%%DATADIR%%/examples/uhd/uhd_two_tone_loopback.grc
>-%%DATADIR%%/examples/uhd/uhd_tx_dpsk.grc
>-%%DATADIR%%/examples/uhd/uhd_wbfm_receive.grc
>-%%DATADIR%%/examples/uhd/usrp_am_mw_rcv.py
>-%%DATADIR%%/examples/uhd/usrp_nbfm_ptt.py
>-%%DATADIR%%/examples/uhd/usrp_nbfm_rcv.py
>-%%DATADIR%%/examples/uhd/usrp_spectrum_sense.py
>-%%DATADIR%%/examples/uhd/usrp_tv_rcv.py
>-%%DATADIR%%/examples/uhd/usrp_tv_rcv_nogui.py
>-%%DATADIR%%/examples/uhd/usrp_wfm_rcv.py
>-%%DATADIR%%/examples/uhd/usrp_wfm_rcv2_nogui.py
>-%%DATADIR%%/examples/uhd/usrp_wfm_rcv_fmdet.py
>-%%DATADIR%%/examples/uhd/usrp_wfm_rcv_nogui.py
>-%%DATADIR%%/examples/uhd/usrp_wfm_rcv_pll.py
>-%%DATADIR%%/examples/uhd/usrp_wfm_rcv_sca.py
>-%%DATADIR%%/examples/uhd/usrp_wxapt_rcv.py
>+%%USRP%%%%DATADIR%%/examples/uhd/fm_tx4.py
>+%%USRP%%%%DATADIR%%/examples/uhd/fm_tx_2_daughterboards.py
>+%%USRP%%%%DATADIR%%/examples/uhd/max_power.py
>+%%USRP%%%%DATADIR%%/examples/uhd/tags_demo
>+%%USRP%%%%DATADIR%%/examples/uhd/uhd_const_wave.grc
>+%%USRP%%%%DATADIR%%/examples/uhd/uhd_dpsk_mod.grc
>+%%USRP%%%%DATADIR%%/examples/uhd/uhd_fft.grc
>+%%USRP%%%%DATADIR%%/examples/uhd/uhd_rx_dpsk.grc
>+%%USRP%%%%DATADIR%%/examples/uhd/uhd_two_tone_loopback.grc
>+%%USRP%%%%DATADIR%%/examples/uhd/uhd_tx_dpsk.grc
>+%%USRP%%%%DATADIR%%/examples/uhd/uhd_wbfm_receive.grc
>+%%USRP%%%%DATADIR%%/examples/uhd/usrp_am_mw_rcv.py
>+%%USRP%%%%DATADIR%%/examples/uhd/usrp_nbfm_ptt.py
>+%%USRP%%%%DATADIR%%/examples/uhd/usrp_nbfm_rcv.py
>+%%USRP%%%%DATADIR%%/examples/uhd/usrp_spectrum_sense.py
>+%%USRP%%%%DATADIR%%/examples/uhd/usrp_tv_rcv.py
>+%%USRP%%%%DATADIR%%/examples/uhd/usrp_tv_rcv_nogui.py
>+%%USRP%%%%DATADIR%%/examples/uhd/usrp_wfm_rcv.py
>+%%USRP%%%%DATADIR%%/examples/uhd/usrp_wfm_rcv2_nogui.py
>+%%USRP%%%%DATADIR%%/examples/uhd/usrp_wfm_rcv_fmdet.py
>+%%USRP%%%%DATADIR%%/examples/uhd/usrp_wfm_rcv_nogui.py
>+%%USRP%%%%DATADIR%%/examples/uhd/usrp_wfm_rcv_pll.py
>+%%USRP%%%%DATADIR%%/examples/uhd/usrp_wfm_rcv_sca.py
>+%%USRP%%%%DATADIR%%/examples/uhd/usrp_wxapt_rcv.py
> %%DATADIR%%/examples/vocoder/alaw_audio_loopback.py
> %%DATADIR%%/examples/vocoder/codec2_audio_loopback.py
> %%DATADIR%%/examples/vocoder/cvsd_audio_loopback.py
> %%DATADIR%%/examples/vocoder/g721_audio_loopback.py
>-%%DATADIR%%/examples/vocoder/g72%%MAJOR_VERSION%%_24_audio_loopback.py
>-%%DATADIR%%/examples/vocoder/g72%%MAJOR_VERSION%%_40_audio_loopback.py
>+%%DATADIR%%/examples/vocoder/g723_24_audio_loopback.py
>+%%DATADIR%%/examples/vocoder/g723_40_audio_loopback.py
> %%DATADIR%%/examples/vocoder/gsm_audio_loopback.py
> %%DATADIR%%/examples/vocoder/ulaw_audio_loopback.py
> %%DATADIR%%/examples/volk_benchmark/README
>@@ -2352,7 +2388,7 @@ libexec/gnuradio/grc_setup_freedesktop
> %%DATADIR%%/examples/volk_benchmark/volk_test_funcs.py
> %%DATADIR%%/examples/volk_benchmark/volk_types.py
> %%DATADIR%%/grc/blocks/analog_agc2_xx.xml
>-%%DATADIR%%/grc/blocks/analog_agc%%MAJOR_VERSION%%_xx.xml
>+%%DATADIR%%/grc/blocks/analog_agc3_xx.xml
> %%DATADIR%%/grc/blocks/analog_agc_xx.xml
> %%DATADIR%%/grc/blocks/analog_am_demod_cf.xml
> %%DATADIR%%/grc/blocks/analog_block_tree.xml
>@@ -2413,9 +2449,11 @@ libexec/gnuradio/grc_setup_freedesktop
> %%DATADIR%%/grc/blocks/blocks_complex_to_real.xml
> %%DATADIR%%/grc/blocks/blocks_conjugate_cc.xml
> %%DATADIR%%/grc/blocks/blocks_copy.xml
>+%%DATADIR%%/grc/blocks/blocks_ctrlport_performance.xml
> %%DATADIR%%/grc/blocks/blocks_ctrlport_probe2_c.xml
> %%DATADIR%%/grc/blocks/blocks_ctrlport_probe2_x.xml
> %%DATADIR%%/grc/blocks/blocks_ctrlport_probe_c.xml
>+%%DATADIR%%/grc/blocks/blocks_ctrlport_viewer.xml
> %%DATADIR%%/grc/blocks/blocks_deinterleave.xml
> %%DATADIR%%/grc/blocks/blocks_delay.xml
> %%DATADIR%%/grc/blocks/blocks_divide_XX.xml
>@@ -2531,7 +2569,7 @@ libexec/gnuradio/grc_setup_freedesktop
> %%DATADIR%%/grc/blocks/channels_channel_model2.xml
> %%DATADIR%%/grc/blocks/channels_conj_fs_iqcorr.xml
> %%DATADIR%%/grc/blocks/channels_distortion_2_gen.xml
>-%%DATADIR%%/grc/blocks/channels_distortion_%%MAJOR_VERSION%%_gen.xml
>+%%DATADIR%%/grc/blocks/channels_distortion_3_gen.xml
> %%DATADIR%%/grc/blocks/channels_dynamic_channel_model.xml
> %%DATADIR%%/grc/blocks/channels_fading_model.xml
> %%DATADIR%%/grc/blocks/channels_impairments.xml
>@@ -2542,8 +2580,9 @@ libexec/gnuradio/grc_setup_freedesktop
> %%DATADIR%%/grc/blocks/channels_selective_fading_model.xml
> %%DATADIR%%/grc/blocks/channels_sro_model.xml
> %%DATADIR%%/grc/blocks/digital_additive_scrambler_bb.xml
>-%%DATADIR%%/grc/blocks/digital_%%QT_BINDIR%%ary_slicer_fb.xml
>+%%DATADIR%%/grc/blocks/digital_binary_slicer_fb.xml
> %%DATADIR%%/grc/blocks/digital_block_tree.xml
>+%%DATADIR%%/grc/blocks/digital_burst_shaper.xml
> %%DATADIR%%/grc/blocks/digital_chunks_to_symbols.xml
> %%DATADIR%%/grc/blocks/digital_clock_recovery_mm_xx.xml
> %%DATADIR%%/grc/blocks/digital_cma_equalizer_cc.xml
>@@ -2553,14 +2592,15 @@ libexec/gnuradio/grc_setup_freedesktop
> %%DATADIR%%/grc/blocks/digital_constellation_receiver_cb.xml
> %%DATADIR%%/grc/blocks/digital_constellation_rect.xml
> %%DATADIR%%/grc/blocks/digital_constellation_soft_decoder_cf.xml
>+%%DATADIR%%/grc/blocks/digital_corr_est_cc.xml
> %%DATADIR%%/grc/blocks/digital_correlate_access_code_bb.xml
> %%DATADIR%%/grc/blocks/digital_correlate_access_code_tag_bb.xml
> %%DATADIR%%/grc/blocks/digital_correlate_access_code_xx_ts.xml
> %%DATADIR%%/grc/blocks/digital_correlate_and_sync_cc.xml
> %%DATADIR%%/grc/blocks/digital_costas_loop_cc.xml
> %%DATADIR%%/grc/blocks/digital_cpmmod_bc.xml
>-%%DATADIR%%/grc/blocks/digital_crc%%MAJOR_VERSION%%2_async_bb.xml
>-%%DATADIR%%/grc/blocks/digital_crc%%MAJOR_VERSION%%2_bb.xml
>+%%DATADIR%%/grc/blocks/digital_crc32_async_bb.xml
>+%%DATADIR%%/grc/blocks/digital_crc32_bb.xml
> %%DATADIR%%/grc/blocks/digital_descrambler_bb.xml
> %%DATADIR%%/grc/blocks/digital_diff_decoder_bb.xml
> %%DATADIR%%/grc/blocks/digital_diff_encoder_bb.xml
>@@ -2581,8 +2621,10 @@ libexec/gnuradio/grc_setup_freedesktop
> %%DATADIR%%/grc/blocks/digital_kurtotic_equalizer_cc.xml
> %%DATADIR%%/grc/blocks/digital_lms_dd_equalizer_cc.xml
> %%DATADIR%%/grc/blocks/digital_map_bb.xml
>+%%DATADIR%%/grc/blocks/digital_modulate_vector.xml
> %%DATADIR%%/grc/blocks/digital_mpsk_receiver_cc.xml
> %%DATADIR%%/grc/blocks/digital_mpsk_snr_est_cc.xml
>+%%DATADIR%%/grc/blocks/digital_msk_timing_recovery_cc.xml
> %%DATADIR%%/grc/blocks/digital_ofdm_carrier_allocator_cvc.xml
> %%DATADIR%%/grc/blocks/digital_ofdm_chanest_vcvc.xml
> %%DATADIR%%/grc/blocks/digital_ofdm_cyclic_prefixer.xml
>@@ -2639,6 +2681,14 @@ libexec/gnuradio/grc_setup_freedesktop
> %%DATADIR%%/grc/blocks/dtv_dvbs2_interleaver_bb.xml
> %%DATADIR%%/grc/blocks/dtv_dvbs2_modulator_bc.xml
> %%DATADIR%%/grc/blocks/dtv_dvbs2_physical_cc.xml
>+%%DATADIR%%/grc/blocks/dtv_dvbt_bit_inner_interleaver.xml
>+%%DATADIR%%/grc/blocks/dtv_dvbt_convolutional_interleaver.xml
>+%%DATADIR%%/grc/blocks/dtv_dvbt_energy_dispersal.xml
>+%%DATADIR%%/grc/blocks/dtv_dvbt_inner_coder.xml
>+%%DATADIR%%/grc/blocks/dtv_dvbt_map.xml
>+%%DATADIR%%/grc/blocks/dtv_dvbt_reed_solomon_enc.xml
>+%%DATADIR%%/grc/blocks/dtv_dvbt_reference_signals.xml
>+%%DATADIR%%/grc/blocks/dtv_dvbt_symbol_inner_interleaver.xml
> %%DATADIR%%/grc/blocks/dtv_dvbt2_cellinterleaver_cc.xml
> %%DATADIR%%/grc/blocks/dtv_dvbt2_framemapper_cc.xml
> %%DATADIR%%/grc/blocks/dtv_dvbt2_freqinterleaver_cc.xml
>@@ -2750,11 +2800,13 @@ libexec/gnuradio/grc_setup_freedesktop
> %%DATADIR%%/grc/blocks/trellis_siso_f.xml
> %%DATADIR%%/grc/blocks/trellis_viterbi_com%%QT_BINDIR%%ed_xx.xml
> %%DATADIR%%/grc/blocks/trellis_viterbi_x.xml
>-%%DATADIR%%/grc/blocks/uhd_amsg_source.xml
>-%%DATADIR%%/grc/blocks/uhd_block_tree.xml
>-%%DATADIR%%/grc/blocks/uhd_usrp_sink.xml
>-%%DATADIR%%/grc/blocks/uhd_usrp_source.xml
>+%%USRP%%%%DATADIR%%/grc/blocks/uhd_amsg_source.xml
>+%%USRP%%%%DATADIR%%/grc/blocks/uhd_block_tree.xml
>+%%USRP%%%%DATADIR%%/grc/blocks/uhd_usrp_sink.xml
>+%%USRP%%%%DATADIR%%/grc/blocks/uhd_usrp_source.xml
> %%DATADIR%%/grc/blocks/variable.xml
>+%%DATADIR%%/grc/blocks/variable_band_pass_filter_taps.xml
>+%%DATADIR%%/grc/blocks/variable_band_reject_filter_taps.xml
> %%DATADIR%%/grc/blocks/variable_cc_decoder_def_list.xml
> %%DATADIR%%/grc/blocks/variable_cc_encoder_def_list.xml
> %%DATADIR%%/grc/blocks/variable_ccsds_encoder_def_list.xml
>@@ -2764,9 +2816,13 @@ libexec/gnuradio/grc_setup_freedesktop
> %%DATADIR%%/grc/blocks/variable_dummy_decoder_def_list.xml
> %%DATADIR%%/grc/blocks/variable_dummy_encoder_def_list.xml
> %%DATADIR%%/grc/blocks/variable_function_probe.xml
>+%%DATADIR%%/grc/blocks/variable_high_pass_filter_taps.xml
>+%%DATADIR%%/grc/blocks/variable_low_pass_filter_taps.xml
> %%DATADIR%%/grc/blocks/variable_repetition_decoder_def_list.xml
> %%DATADIR%%/grc/blocks/variable_repetition_encoder_def_list.xml
>+%%DATADIR%%/grc/blocks/variable_rrc_filter_taps.xml
> %%DATADIR%%/grc/blocks/variable_slider.xml
>+%%DATADIR%%/grc/blocks/variable_struct.xml
> %%DATADIR%%/grc/blocks/variable_static_text.xml
> %%DATADIR%%/grc/blocks/variable_text_box.xml
> %%DATADIR%%/grc/blocks/video_block_tree.xml
>@@ -2784,10 +2840,10 @@ libexec/gnuradio/grc_setup_freedesktop
> %%DATADIR%%/grc/blocks/vocoder_cvsd_encode_sb.xml
> %%DATADIR%%/grc/blocks/vocoder_g721_decode_bs.xml
> %%DATADIR%%/grc/blocks/vocoder_g721_encode_sb.xml
>-%%DATADIR%%/grc/blocks/vocoder_g72%%MAJOR_VERSION%%_24_decode_bs.xml
>-%%DATADIR%%/grc/blocks/vocoder_g72%%MAJOR_VERSION%%_24_encode_sb.xml
>-%%DATADIR%%/grc/blocks/vocoder_g72%%MAJOR_VERSION%%_40_decode_bs.xml
>-%%DATADIR%%/grc/blocks/vocoder_g72%%MAJOR_VERSION%%_40_encode_sb.xml
>+%%DATADIR%%/grc/blocks/vocoder_g723_24_decode_bs.xml
>+%%DATADIR%%/grc/blocks/vocoder_g723_24_encode_sb.xml
>+%%DATADIR%%/grc/blocks/vocoder_g723_40_decode_bs.xml
>+%%DATADIR%%/grc/blocks/vocoder_g723_40_encode_sb.xml
> %%DATADIR%%/grc/blocks/vocoder_gsm_fr_decode_ps.xml
> %%DATADIR%%/grc/blocks/vocoder_gsm_fr_encode_sp.xml
> %%DATADIR%%/grc/blocks/vocoder_ulaw_decode_bs.xml
>@@ -2803,16 +2859,16 @@ libexec/gnuradio/grc_setup_freedesktop
> %%DATADIR%%/grc/blocks/xmlrpc_server.xml
> %%DATADIR%%/grc/freedesktop/gnuradio-grc.desktop
> %%DATADIR%%/grc/freedesktop/gnuradio-grc.xml
>+%%DATADIR%%/grc/freedesktop/grc-icon-16.png
> %%DATADIR%%/grc/freedesktop/grc-icon-128.png
>+%%DATADIR%%/grc/freedesktop/grc-icon-24.png
> %%DATADIR%%/grc/freedesktop/grc-icon-256.png
>-%%DATADIR%%/grc/freedesktop/grc-icon-%%MAJOR_VERSION%%2.png
>+%%DATADIR%%/grc/freedesktop/grc-icon-32.png
> %%DATADIR%%/grc/freedesktop/grc-icon-48.png
> %%DATADIR%%/grc/freedesktop/grc-icon-64.png
> %%DATADIR%%/modtool/gr-newmod/CMakeLists.txt
>-%%DATADIR%%/modtool/gr-newmod/CMakeLists.txt.bak
> %%DATADIR%%/modtool/gr-newmod/MANIFEST.md
> %%DATADIR%%/modtool/gr-newmod/apps/CMakeLists.txt
>-%%DATADIR%%/modtool/gr-newmod/apps/CMakeLists.txt.bak
> %%DATADIR%%/modtool/gr-newmod/cmake/Modules/CMakeParseArgumentsCopy.cmake
> %%DATADIR%%/modtool/gr-newmod/cmake/Modules/FindCppUnit.cmake
> %%DATADIR%%/modtool/gr-newmod/cmake/Modules/FindGnuradioRuntime.cmake
>@@ -2825,10 +2881,8 @@ libexec/gnuradio/grc_setup_freedesktop
> %%DATADIR%%/modtool/gr-newmod/cmake/Modules/howtoConfig.cmake
> %%DATADIR%%/modtool/gr-newmod/cmake/cmake_uninstall.cmake.in
> %%DATADIR%%/modtool/gr-newmod/docs/CMakeLists.txt
>-%%DATADIR%%/modtool/gr-newmod/docs/CMakeLists.txt.bak
> %%DATADIR%%/modtool/gr-newmod/docs/README.howto
> %%DATADIR%%/modtool/gr-newmod/docs/doxygen/CMakeLists.txt
>-%%DATADIR%%/modtool/gr-newmod/docs/doxygen/CMakeLists.txt.bak
> %%DATADIR%%/modtool/gr-newmod/docs/doxygen/Doxyfile.in
> %%DATADIR%%/modtool/gr-newmod/docs/doxygen/Doxyfile.swig_doc.in
> %%DATADIR%%/modtool/gr-newmod/docs/doxygen/doxyxml/__init__.py
>@@ -2845,22 +2899,17 @@ libexec/gnuradio/grc_setup_freedesktop
> %%DATADIR%%/modtool/gr-newmod/docs/doxygen/swig_doc.py
> %%DATADIR%%/modtool/gr-newmod/examples/README
> %%DATADIR%%/modtool/gr-newmod/grc/CMakeLists.txt
>-%%DATADIR%%/modtool/gr-newmod/grc/CMakeLists.txt.bak
> %%DATADIR%%/modtool/gr-newmod/include/howto/CMakeLists.txt
>-%%DATADIR%%/modtool/gr-newmod/include/howto/CMakeLists.txt.bak
> %%DATADIR%%/modtool/gr-newmod/include/howto/api.h
> %%DATADIR%%/modtool/gr-newmod/lib/CMakeLists.txt
>-%%DATADIR%%/modtool/gr-newmod/lib/CMakeLists.txt.bak
> %%DATADIR%%/modtool/gr-newmod/lib/qa_howto.cc
> %%DATADIR%%/modtool/gr-newmod/lib/qa_howto.h
> %%DATADIR%%/modtool/gr-newmod/lib/test_howto.cc
> %%DATADIR%%/modtool/gr-newmod/python/CMakeLists.txt
>-%%DATADIR%%/modtool/gr-newmod/python/CMakeLists.txt.bak
> %%DATADIR%%/modtool/gr-newmod/python/__init__.py
> %%DATADIR%%/modtool/gr-newmod/python/build_utils.py
> %%DATADIR%%/modtool/gr-newmod/python/build_utils_codes.py
> %%DATADIR%%/modtool/gr-newmod/swig/CMakeLists.txt
>-%%DATADIR%%/modtool/gr-newmod/swig/CMakeLists.txt.bak
> %%DATADIR%%/modtool/gr-newmod/swig/howto_swig.i
> %%DATADIR%%/themes/alt.qss
> %%DATADIR%%/themes/dark.qss

Actions: View | Diff

Attachments on bug 203500: 161640