From 22df0cf5c9fad13b6f9c8cc353ece60ce734389e Mon Sep 17 00:00:00 2001 From: db Date: Mon, 10 Oct 2016 12:43:22 +0000 Subject: Update to 3.7.9.2 Remove unecessary diffs using @sample keyword in pkg-plist Use uhd port instead of usrp port Add missing dependancies Fix wrongly used PLIST_SUB [1] Fix build due to missing dependency [2] Did my best to address libgcc stupidity for now [3] Please read http://lists.freebsd.org/pipermail/freebsd-toolchain/2016-August/002249.html PR 208120 [1] PR ports/210095 fix by @takefu [2] PR ports/210444 fix by @takefu [3] PR ports/211889 fix by @db --- comms/gnuradio/Makefile | 41 +- comms/gnuradio/distinfo | 5 +- comms/gnuradio/files/patch-CMakeLists.txt | 2 +- comms/gnuradio/files/patch-cmake-3.5.0 | 162 ------- .../files/patch-cmake_Modules_FindUSB.cmake | 2 +- .../files/patch-cmake_Modules_GrBoost.cmake | 2 +- .../files/patch-cmake_Modules_GrMiscUtils.cmake | 2 +- .../gnuradio/files/patch-docs_doxygen_Doxyfile.in | 6 +- .../files/patch-gnuradio-runtime_CMakeLists.txt | 11 - .../patch-gnuradio-runtime_lib_thread_thread.cc | 2 +- .../files/patch-gr-audio_doc_CMakeLists.txt | 2 +- .../files/patch-gr-audio_lib_CMakeLists.txt | 19 - .../files/patch-gr-digital_doc_CMakeLists.txt | 2 +- .../patch-gr-dtv__lib__dvbt__dvbt_reed_solomon.cc | 2 +- .../gnuradio/files/patch-gr-fcd_doc_CMakeLists.txt | 2 +- .../gnuradio/files/patch-gr-fcd_lib_CMakeLists.txt | 2 +- .../files/patch-gr-fcd_lib_hid_hid-libusb.c | 2 +- .../gnuradio/files/patch-gr-fft_doc_CMakeLists.txt | 12 - .../files/patch-gr-filter_doc_CMakeLists.txt | 12 - comms/gnuradio/files/patch-gr-qtgui_CMakeLists.txt | 31 -- .../files/patch-gr-qtgui_doc_CMakeLists.txt | 12 - .../files/patch-gr-trellis_doc_CMakeLists.txt | 29 -- comms/gnuradio/files/patch-gr-uhd_CMakeLists.txt | 11 - .../gnuradio/files/patch-gr-uhd_doc_CMakeLists.txt | 12 - .../patch-gr-utils_python_modtool_CMakeLists.txt | 21 - .../files/patch-gr-vocoder_doc_CMakeLists.txt | 12 - comms/gnuradio/files/patch-gr-wxgui_CMakeLists.txt | 33 -- comms/gnuradio/files/patch-grc_CMakeLists.txt | 24 -- .../files/patch-grc_scripts_gnuradio-companion | 19 +- comms/gnuradio/files/patch-volk_CMakeLists.txt | 6 +- .../files/patch-volk_tmpl_volk__cpu.tmpl.c | 39 -- comms/gnuradio/pkg-descr | 2 +- comms/gnuradio/pkg-plist | 480 +++++++++++++-------- 33 files changed, 359 insertions(+), 662 deletions(-) delete mode 100644 comms/gnuradio/files/patch-cmake-3.5.0 delete mode 100644 comms/gnuradio/files/patch-gnuradio-runtime_CMakeLists.txt delete mode 100644 comms/gnuradio/files/patch-gr-audio_lib_CMakeLists.txt delete mode 100644 comms/gnuradio/files/patch-gr-fft_doc_CMakeLists.txt delete mode 100644 comms/gnuradio/files/patch-gr-filter_doc_CMakeLists.txt delete mode 100644 comms/gnuradio/files/patch-gr-qtgui_CMakeLists.txt delete mode 100644 comms/gnuradio/files/patch-gr-qtgui_doc_CMakeLists.txt delete mode 100644 comms/gnuradio/files/patch-gr-trellis_doc_CMakeLists.txt delete mode 100644 comms/gnuradio/files/patch-gr-uhd_CMakeLists.txt delete mode 100644 comms/gnuradio/files/patch-gr-uhd_doc_CMakeLists.txt delete mode 100644 comms/gnuradio/files/patch-gr-utils_python_modtool_CMakeLists.txt delete mode 100644 comms/gnuradio/files/patch-gr-vocoder_doc_CMakeLists.txt delete mode 100644 comms/gnuradio/files/patch-gr-wxgui_CMakeLists.txt delete mode 100644 comms/gnuradio/files/patch-grc_CMakeLists.txt delete mode 100644 comms/gnuradio/files/patch-volk_tmpl_volk__cpu.tmpl.c (limited to 'comms/gnuradio') diff --git a/comms/gnuradio/Makefile b/comms/gnuradio/Makefile index 0f2657cc94b1..d66e44ea3f02 100644 --- a/comms/gnuradio/Makefile +++ b/comms/gnuradio/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= gnuradio -PORTVERSION= 3.7.8 +PORTVERSION= 3.7.9.2 CATEGORIES= comms astro hamradio MASTER_SITES= http://gnuradio.org/releases/gnuradio/ \ LOCAL/db @@ -30,7 +30,10 @@ LIB_DEPENDS= libcppunit.so:devel/cppunit \ libportaudio.so:audio/portaudio \ libjack.so:audio/jack \ libasound.so:audio/alsa-lib \ - libgsl.so:math/gsl + libgsl.so:math/gsl \ + libgsm.so:audio/gsm \ + libboost_date_time.so:devel/boost-libs \ + liborc-0.4.so:devel/orc RUN_DEPENDS:= ${BUILD_DEPENDS} # USES=compiler:c11 is necessary because base GCC fails: @@ -39,17 +42,18 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} # 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}" \ +CMAKE_ARGS+= -DSWIG_EXECUTABLE:STRING="${LOCALBASE}/bin/swig2.0"\ + -DICONV_PREFIX:STRING="${ICONV_PREFIX}" \ -DICONV_LIB:STRING="X${ICONV_LIB}" \ - -DENABLE_GR_CTRLPORT="YES" + -DENABLE_GR_CTRLPORT="YES" \ + -DCMAKE_INSTALL_RPATH:STRING="${LOCALBASE}/lib/gcc${_GCC_VER}" # for detailed debugging uncomment the next line #CMAKE_ARGS+= --debug-output --trace -MAJOR_SUB_VER= 3.7.8 +MAJOR_SUB_VER= 3.7.9.2 DOCSDIR= share/doc/${PORTNAME}-${MAJOR_SUB_VER} USE_GNOME= pygtk2 USE_WX= 3.0+ -USE_QT4= gui xml qmake moc rcc uic +USE_QT4= corelib gui xml qmake moc rcc uic WX_COMPS= wx wx:build wx:run python:build python:run USE_LDCONFIG= yes PLIST_SUB+= MAJOR_VERSION="3" @@ -58,14 +62,14 @@ 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 +OPTIONS_DEFINE= UHD TESTING # Unfortunately building docs on i386 fails ##OPTIONS_EXCLUDE_${i386}= DOCS # Yay. building docs is broken on 10 and HEAD too so turn them all off OPTIONS_EXCLUDE= DOCS -OPTIONS_DEFAULT= USRP +OPTIONS_DEFAULT= UHD OPTIONS_SUB= yes -USRP_DESC= Include USRP support (UHD) from Ettus +UHD_DESC= Include UHD support from Ettus TESTING_DESC= Include testing support PLIST_SUB+= PORTVERSION=${PORTVERSION} @@ -83,9 +87,8 @@ DOCS_CMAKE_OFF= -DENABLE_DOXYGEN:STRING="OFF" \ -DENABLE_BAD_BOOST="ON" HAVE_PORTDOCS= YES -USRP_CMAKE_ON= -DENABLE_GR_UHD:STRING="ON" -USRP_CMAKE_OFF= -DENABLE_GR_UHD:STRING="OFF" -USRP_BUILD_DEPENDS= ${LOCALBASE}/include/uhd/config.hpp:comms/usrp +UHD_CMAKE_ON= -DENABLE_GR_UHD:STRING="ON" +UHD_CMAKE_OFF= -DENABLE_GR_UHD:STRING="OFF" TESTING_CMAKE_ON= -DENABLE_TESTING:STRING="ON" TESTING_CMAKE_OFF= -DENABLE_TESTING:STRING="OFF" @@ -93,22 +96,26 @@ TESTING_BUILD_DEPENDS= cppunit-config:devel/cppunit .include -.if ${PORT_OPTIONS:MUSRP} +.if ${PORT_OPTIONS:MUHD} LIBSTRIP_FILES+= uhd +LIB_DEPENDS+= libuhd.so:comms/uhd .endif .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 USE_GCC= yes .endif +PATCH_FILES= docs/doxygen/Doxyfile.in \ + gr-fec/lib/CMakeLists.txt + post-patch: @${FIND} ${WRKSRC}/.. -name CMakeLists.txt | \ ${XARGS} ${REINPLACE_CMD} -e \ "s|{GR_LIBRARY_DIR}/pkgconfig|{GR_PKGCONFIG_DIR}/pkgconfig|g" - @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' \ - ${WRKSRC}/docs/doxygen/Doxyfile.in +.for p in ${PATCH_FILES} @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ - ${WRKSRC}/cmake/Modules/FindPortaudio.cmake + ${WRKSRC}/${p} +.endfor post-install: .for a in ${LIBSTRIP_FILES} diff --git a/comms/gnuradio/distinfo b/comms/gnuradio/distinfo index 5680d3db894d..c822eb7bfca5 100644 --- a/comms/gnuradio/distinfo +++ b/comms/gnuradio/distinfo @@ -1,2 +1,3 @@ -SHA256 (gnuradio-3.7.8.tar.gz) = fe19cb54b5d77fb76dde61d5cf184c6dee7066779b45c51676bae6e6d0cd4172 -SIZE (gnuradio-3.7.8.tar.gz) = 3990172 +TIMESTAMP = 1475075626 +SHA256 (gnuradio-3.7.9.2.tar.gz) = 71662ff8089b8533cd8162ecef57661ec97d0026735876b1b55d0efcf654b561 +SIZE (gnuradio-3.7.9.2.tar.gz) = 4911047 diff --git a/comms/gnuradio/files/patch-CMakeLists.txt b/comms/gnuradio/files/patch-CMakeLists.txt index d37e7b58742b..b5814c6592a9 100644 --- a/comms/gnuradio/files/patch-CMakeLists.txt +++ b/comms/gnuradio/files/patch-CMakeLists.txt @@ -1,4 +1,4 @@ ---- CMakeLists.txt.orig 2015-07-25 20:27:13 UTC +--- CMakeLists.txt.orig 2016-04-11 02:35:01 UTC +++ CMakeLists.txt @@ -29,6 +29,11 @@ cmake_minimum_required(VERSION 2.6) project(gnuradio CXX C) diff --git a/comms/gnuradio/files/patch-cmake-3.5.0 b/comms/gnuradio/files/patch-cmake-3.5.0 deleted file mode 100644 index 89bd1dcb6055..000000000000 --- a/comms/gnuradio/files/patch-cmake-3.5.0 +++ /dev/null @@ -1,162 +0,0 @@ -Changing CMAKE_{SOURCE,BINARY}_DIR like volk does in its top-level -CMakeLists.txt no longer works with CMake 3.5.0. - -Use PROJECT_{BINARY,SOURCE}_DIR instead. - -Obtained from: http://pkgs.fedoraproject.org/cgit/rpms/gnuradio.git/commit/?id=b50c7e66f6e3a1e6a84e25505d3fd873756c2027 -Upstream patch and discussion: https://github.com/gnuradio/volk/pull/65 ---- volk/apps/CMakeLists.txt.cmake35 2016-02-07 10:09:12.000000000 -0700 -+++ volk/apps/CMakeLists.txt 2016-02-23 20:47:31.513538541 -0700 -@@ -19,23 +19,23 @@ - # Setup profiler - ######################################################################## - if(MSVC) -- include_directories(${CMAKE_SOURCE_DIR}/cmake/msvc) -+ include_directories(${PROJECT_SOURCE_DIR}/cmake/msvc) - endif(MSVC) - - include_directories( - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_BINARY_DIR} -- ${CMAKE_SOURCE_DIR}/include -- ${CMAKE_BINARY_DIR}/include -- ${CMAKE_SOURCE_DIR}/lib -- ${CMAKE_BINARY_DIR}/lib -+ ${PROJECT_SOURCE_DIR}/include -+ ${PROJECT_BINARY_DIR}/include -+ ${PROJECT_SOURCE_DIR}/lib -+ ${PROJECT_BINARY_DIR}/lib - ${Boost_INCLUDE_DIRS} - ) - - # MAKE volk_profile - add_executable(volk_profile - ${CMAKE_CURRENT_SOURCE_DIR}/volk_profile.cc -- ${CMAKE_SOURCE_DIR}/lib/qa_utils.cc -+ ${PROJECT_SOURCE_DIR}/lib/qa_utils.cc - ) - - ---- volk/lib/CMakeLists.txt.cmake35 2016-02-07 10:09:12.000000000 -0700 -+++ volk/lib/CMakeLists.txt 2016-02-23 20:47:31.516538564 -0700 -@@ -90,7 +90,7 @@ endif() - ######################################################################## - execute_process( - COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B} -- ${CMAKE_SOURCE_DIR}/gen/volk_compile_utils.py -+ ${PROJECT_SOURCE_DIR}/gen/volk_compile_utils.py - --mode "arch_flags" --compiler "${COMPILER_NAME}" - OUTPUT_VARIABLE arch_flag_lines OUTPUT_STRIP_TRAILING_WHITESPACE - ) -@@ -278,7 +278,7 @@ message(STATUS "Available architectures: - ######################################################################## - execute_process( - COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B} -- ${CMAKE_SOURCE_DIR}/gen/volk_compile_utils.py -+ ${PROJECT_SOURCE_DIR}/gen/volk_compile_utils.py - --mode "machines" --archs "${available_archs}" - OUTPUT_VARIABLE available_machines OUTPUT_STRIP_TRAILING_WHITESPACE - ) -@@ -310,9 +310,9 @@ message(STATUS "Available machines: ${av - ######################################################################## - - #dependencies are all python, xml, and header implementation files --file(GLOB xml_files ${CMAKE_SOURCE_DIR}/gen/*.xml) --file(GLOB py_files ${CMAKE_SOURCE_DIR}/gen/*.py) --file(GLOB h_files ${CMAKE_SOURCE_DIR}/kernels/volk/*.h) -+file(GLOB xml_files ${PROJECT_SOURCE_DIR}/gen/*.xml) -+file(GLOB py_files ${PROJECT_SOURCE_DIR}/gen/*.py) -+file(GLOB h_files ${PROJECT_SOURCE_DIR}/kernels/volk/*.h) - - macro(gen_template tmpl output) - list(APPEND volk_gen_sources ${output}) -@@ -320,21 +320,21 @@ macro(gen_template tmpl output) - OUTPUT ${output} - DEPENDS ${xml_files} ${py_files} ${h_files} ${tmpl} - COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B} -- ${CMAKE_SOURCE_DIR}/gen/volk_tmpl_utils.py -+ ${PROJECT_SOURCE_DIR}/gen/volk_tmpl_utils.py - --input ${tmpl} --output ${output} ${ARGN} - ) - endmacro(gen_template) - --make_directory(${CMAKE_BINARY_DIR}/include/volk) -+make_directory(${PROJECT_BINARY_DIR}/include/volk) - --gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk.tmpl.h ${CMAKE_BINARY_DIR}/include/volk/volk.h) --gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk.tmpl.c ${CMAKE_BINARY_DIR}/lib/volk.c) --gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk_typedefs.tmpl.h ${CMAKE_BINARY_DIR}/include/volk/volk_typedefs.h) --gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk_cpu.tmpl.h ${CMAKE_BINARY_DIR}/include/volk/volk_cpu.h) --gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk_cpu.tmpl.c ${CMAKE_BINARY_DIR}/lib/volk_cpu.c) --gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk_config_fixed.tmpl.h ${CMAKE_BINARY_DIR}/include/volk/volk_config_fixed.h) --gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk_machines.tmpl.h ${CMAKE_BINARY_DIR}/lib/volk_machines.h) --gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk_machines.tmpl.c ${CMAKE_BINARY_DIR}/lib/volk_machines.c) -+gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk.tmpl.h ${PROJECT_BINARY_DIR}/include/volk/volk.h) -+gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk.tmpl.c ${PROJECT_BINARY_DIR}/lib/volk.c) -+gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk_typedefs.tmpl.h ${PROJECT_BINARY_DIR}/include/volk/volk_typedefs.h) -+gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk_cpu.tmpl.h ${PROJECT_BINARY_DIR}/include/volk/volk_cpu.h) -+gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk_cpu.tmpl.c ${PROJECT_BINARY_DIR}/lib/volk_cpu.c) -+gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk_config_fixed.tmpl.h ${PROJECT_BINARY_DIR}/include/volk/volk_config_fixed.h) -+gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk_machines.tmpl.h ${PROJECT_BINARY_DIR}/lib/volk_machines.h) -+gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk_machines.tmpl.c ${PROJECT_BINARY_DIR}/lib/volk_machines.c) - - set(BASE_CFLAGS NONE) - string(TOUPPER ${CMAKE_BUILD_TYPE} CBTU) -@@ -362,12 +362,12 @@ set(COMPILER_INFO "${CMAKE_C_COMPILER}:: - foreach(machine_name ${available_machines}) - #generate machine source - set(machine_source ${CMAKE_CURRENT_BINARY_DIR}/volk_machine_${machine_name}.c) -- gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk_machine_xxx.tmpl.c ${machine_source} ${machine_name}) -+ gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk_machine_xxx.tmpl.c ${machine_source} ${machine_name}) - - #determine machine flags - execute_process( - COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B} -- ${CMAKE_SOURCE_DIR}/gen/volk_compile_utils.py -+ ${PROJECT_SOURCE_DIR}/gen/volk_compile_utils.py - --mode "machine_flags" --machine "${machine_name}" --compiler "${COMPILER_NAME}" - OUTPUT_VARIABLE ${machine_name}_flags OUTPUT_STRIP_TRAILING_WHITESPACE - ) -@@ -393,9 +393,9 @@ string(REPLACE "\n" " \\n" COMPILER_INFO - # Set local include directories first - ######################################################################## - include_directories( -- ${CMAKE_BINARY_DIR}/include -- ${CMAKE_SOURCE_DIR}/include -- ${CMAKE_SOURCE_DIR}/kernels -+ ${PROJECT_BINARY_DIR}/include -+ ${PROJECT_SOURCE_DIR}/include -+ ${PROJECT_SOURCE_DIR}/kernels - ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_CURRENT_SOURCE_DIR} - ) -@@ -420,8 +420,8 @@ if(${CMAKE_VERSION} VERSION_GREATER "2.8 - # setup architecture specific assembler flags - set(ARCH_ASM_FLAGS "-mfpu=neon -g") - # then add the files -- include_directories(${CMAKE_SOURCE_DIR}/kernels/volk/asm/neon) -- file(GLOB asm_files ${CMAKE_SOURCE_DIR}/kernels/volk/asm/neon/*.s) -+ include_directories(${PROJECT_SOURCE_DIR}/kernels/volk/asm/neon) -+ file(GLOB asm_files ${PROJECT_SOURCE_DIR}/kernels/volk/asm/neon/*.s) - foreach(asm_file ${asm_files}) - list(APPEND volk_sources ${asm_file}) - message(STATUS "Adding source file: ${asm_file}") -@@ -453,7 +453,7 @@ if(ORC_FOUND) - list(APPEND volk_libraries ${ORC_LIBRARIES}) - - #setup orc functions -- file(GLOB orc_files ${CMAKE_SOURCE_DIR}/kernels/volk/asm/orc/*.orc) -+ file(GLOB orc_files ${PROJECT_SOURCE_DIR}/kernels/volk/asm/orc/*.orc) - foreach(orc_file ${orc_files}) - - #extract the name for the generated c source from the orc file -@@ -511,7 +511,7 @@ PROPERTIES COMPILE_DEFINITIONS "${machin - - if(MSVC) - #add compatibility includes for stdint types -- include_directories(${CMAKE_SOURCE_DIR}/cmake/msvc) -+ include_directories(${PROJECT_SOURCE_DIR}/cmake/msvc) - add_definitions(-DHAVE_CONFIG_H) - #compile the sources as C++ due to the lack of complex.h under MSVC - set_source_files_properties(${volk_sources} PROPERTIES LANGUAGE CXX) -diff -up gnuradio-3.7.9.1/volk/python/volk_modtool/CMakeLists.txt.cmake35 gnuradio-3.7.9.1/volk/python/volk_modtool/CMakeLists.txt diff --git a/comms/gnuradio/files/patch-cmake_Modules_FindUSB.cmake b/comms/gnuradio/files/patch-cmake_Modules_FindUSB.cmake index 1610e5f02d83..e174ca320d0f 100644 --- a/comms/gnuradio/files/patch-cmake_Modules_FindUSB.cmake +++ b/comms/gnuradio/files/patch-cmake_Modules_FindUSB.cmake @@ -1,4 +1,4 @@ ---- cmake/Modules/FindUSB.cmake.orig 2015-05-12 09:39:44 UTC +--- cmake/Modules/FindUSB.cmake.orig 2015-04-13 14:32:43 UTC +++ cmake/Modules/FindUSB.cmake @@ -1,20 +1,30 @@ if(NOT LIBUSB_FOUND) diff --git a/comms/gnuradio/files/patch-cmake_Modules_GrBoost.cmake b/comms/gnuradio/files/patch-cmake_Modules_GrBoost.cmake index 71642d01cf76..dd57f811f635 100644 --- a/comms/gnuradio/files/patch-cmake_Modules_GrBoost.cmake +++ b/comms/gnuradio/files/patch-cmake_Modules_GrBoost.cmake @@ -1,4 +1,4 @@ ---- cmake/Modules/GrBoost.cmake.orig 2015-05-12 09:39:44 UTC +--- cmake/Modules/GrBoost.cmake.orig 2015-04-13 14:32:43 UTC +++ cmake/Modules/GrBoost.cmake @@ -53,6 +53,8 @@ if(MSVC) endif(MSVC) diff --git a/comms/gnuradio/files/patch-cmake_Modules_GrMiscUtils.cmake b/comms/gnuradio/files/patch-cmake_Modules_GrMiscUtils.cmake index d44873906ade..a6a3a18ff6ff 100644 --- a/comms/gnuradio/files/patch-cmake_Modules_GrMiscUtils.cmake +++ b/comms/gnuradio/files/patch-cmake_Modules_GrMiscUtils.cmake @@ -1,4 +1,4 @@ ---- cmake/Modules/GrMiscUtils.cmake.orig 2015-05-12 09:39:44 UTC +--- cmake/Modules/GrMiscUtils.cmake.orig 2015-04-13 14:32:43 UTC +++ cmake/Modules/GrMiscUtils.cmake @@ -148,7 +148,31 @@ function(GR_LIBRARY_FOO target) ARCHIVE DESTINATION ${GR_LIBRARY_DIR} COMPONENT ${GR_LIBRARY_DEVEL_COMPONENT} # .lib file diff --git a/comms/gnuradio/files/patch-docs_doxygen_Doxyfile.in b/comms/gnuradio/files/patch-docs_doxygen_Doxyfile.in index 87f5240ea285..3e800bde335d 100644 --- a/comms/gnuradio/files/patch-docs_doxygen_Doxyfile.in +++ b/comms/gnuradio/files/patch-docs_doxygen_Doxyfile.in @@ -1,11 +1,11 @@ ---- docs/doxygen/Doxyfile.in.orig 2015-05-12 09:39:44 UTC +--- docs/doxygen/Doxyfile.in.orig 2015-04-14 14:38:41 UTC +++ docs/doxygen/Doxyfile.in -@@ -1864,7 +1864,7 @@ DOT_FONTSIZE = 10 +@@ -1891,7 +1891,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. -DOT_FONTPATH = -+DOT_FONTPATH = %%PREFIX%%/share/fonts/freefont-ttf ++DOT_FONTPATH = %%LOCALBASE%%/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 --git a/comms/gnuradio/files/patch-gnuradio-runtime_CMakeLists.txt b/comms/gnuradio/files/patch-gnuradio-runtime_CMakeLists.txt deleted file mode 100644 index 7ca7e5ada86e..000000000000 --- a/comms/gnuradio/files/patch-gnuradio-runtime_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- gnuradio-runtime/CMakeLists.txt.orig 2015-05-12 09:39:44 UTC -+++ gnuradio-runtime/CMakeLists.txt -@@ -165,7 +165,7 @@ configure_file( - - install( - FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-runtime.pc -- DESTINATION ${GR_LIBRARY_DIR}/pkgconfig -+ DESTINATION ${GR_PKGCONFIG_DIR}/pkgconfig - COMPONENT "runtime_devel" - ) - diff --git a/comms/gnuradio/files/patch-gnuradio-runtime_lib_thread_thread.cc b/comms/gnuradio/files/patch-gnuradio-runtime_lib_thread_thread.cc index babad22c8255..bd58565dc93f 100644 --- a/comms/gnuradio/files/patch-gnuradio-runtime_lib_thread_thread.cc +++ b/comms/gnuradio/files/patch-gnuradio-runtime_lib_thread_thread.cc @@ -1,4 +1,4 @@ ---- gnuradio-runtime/lib/thread/thread.cc.orig 2015-05-12 09:39:44 UTC +--- gnuradio-runtime/lib/thread/thread.cc.orig 2015-04-13 14:32:43 UTC +++ gnuradio-runtime/lib/thread/thread.cc @@ -276,6 +276,7 @@ namespace gr { void diff --git a/comms/gnuradio/files/patch-gr-audio_doc_CMakeLists.txt b/comms/gnuradio/files/patch-gr-audio_doc_CMakeLists.txt index 8cd4b2c96eab..3b928f228022 100644 --- a/comms/gnuradio/files/patch-gr-audio_doc_CMakeLists.txt +++ b/comms/gnuradio/files/patch-gr-audio_doc_CMakeLists.txt @@ -1,4 +1,4 @@ ---- gr-audio/doc/CMakeLists.txt.orig 2015-05-12 09:39:44 UTC +--- gr-audio/doc/CMakeLists.txt.orig 2015-04-13 14:32:43 UTC +++ gr-audio/doc/CMakeLists.txt @@ -17,7 +17,9 @@ # the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/comms/gnuradio/files/patch-gr-audio_lib_CMakeLists.txt b/comms/gnuradio/files/patch-gr-audio_lib_CMakeLists.txt deleted file mode 100644 index 2fc9cc32e366..000000000000 --- a/comms/gnuradio/files/patch-gr-audio_lib_CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ ---- gr-audio/lib/CMakeLists.txt.orig 2015-05-12 09:39:44 UTC -+++ gr-audio/lib/CMakeLists.txt -@@ -203,7 +203,15 @@ add_library(gnuradio-audio SHARED ${gr_a - target_link_libraries(gnuradio-audio ${gr_audio_libs}) - GR_LIBRARY_FOO(gnuradio-audio RUNTIME_COMPONENT "audio_runtime" DEVEL_COMPONENT "audio_devel") - --install(FILES ${gr_audio_confs} DESTINATION ${GR_PREFSDIR} COMPONENT "audio_runtime") -+if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") -+ foreach (audioconf ${gr_audio_confs}) -+ GET_FILENAME_COMPONENT(baseaudioconf ${audioconf} NAME) -+ set(newaudioconf "${baseaudioconf}.sample") -+ install(FILES ${audioconf} DESTINATION ${GR_PREFSDIR} RENAME ${newaudioconf} COMPONENT "audio_runtime") -+ endforeach() -+else() -+ install(FILES ${gr_audio_confs} DESTINATION ${GR_PREFSDIR} COMPONENT "audio_runtime") -+endif() - - if(ENABLE_STATIC_LIBS) - if(ENABLE_GR_CTRLPORT) diff --git a/comms/gnuradio/files/patch-gr-digital_doc_CMakeLists.txt b/comms/gnuradio/files/patch-gr-digital_doc_CMakeLists.txt index fc7b1f50836d..9ba4c01d30d5 100644 --- a/comms/gnuradio/files/patch-gr-digital_doc_CMakeLists.txt +++ b/comms/gnuradio/files/patch-gr-digital_doc_CMakeLists.txt @@ -1,4 +1,4 @@ ---- gr-digital/doc/CMakeLists.txt.orig 2015-05-12 09:39:44 UTC +--- gr-digital/doc/CMakeLists.txt.orig 2015-04-13 14:32:43 UTC +++ gr-digital/doc/CMakeLists.txt @@ -17,7 +17,9 @@ # the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/comms/gnuradio/files/patch-gr-dtv__lib__dvbt__dvbt_reed_solomon.cc b/comms/gnuradio/files/patch-gr-dtv__lib__dvbt__dvbt_reed_solomon.cc index 85f071c00f16..aad743c0a9a5 100644 --- a/comms/gnuradio/files/patch-gr-dtv__lib__dvbt__dvbt_reed_solomon.cc +++ b/comms/gnuradio/files/patch-gr-dtv__lib__dvbt__dvbt_reed_solomon.cc @@ -1,4 +1,4 @@ ---- gr-dtv/lib/dvbt/dvbt_reed_solomon.cc.orig 2015-08-05 18:54:39 UTC +--- gr-dtv/lib/dvbt/dvbt_reed_solomon.cc.orig 2015-08-28 14:47:45 UTC +++ gr-dtv/lib/dvbt/dvbt_reed_solomon.cc @@ -42,7 +42,7 @@ namespace gr { d_p = p; d_m = m; diff --git a/comms/gnuradio/files/patch-gr-fcd_doc_CMakeLists.txt b/comms/gnuradio/files/patch-gr-fcd_doc_CMakeLists.txt index 5c5c478b5e83..afb5beb7ae29 100644 --- a/comms/gnuradio/files/patch-gr-fcd_doc_CMakeLists.txt +++ b/comms/gnuradio/files/patch-gr-fcd_doc_CMakeLists.txt @@ -1,4 +1,4 @@ ---- gr-fcd/doc/CMakeLists.txt.orig 2015-05-12 09:39:44 UTC +--- gr-fcd/doc/CMakeLists.txt.orig 2015-04-13 14:32:43 UTC +++ gr-fcd/doc/CMakeLists.txt @@ -17,7 +17,9 @@ # the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/comms/gnuradio/files/patch-gr-fcd_lib_CMakeLists.txt b/comms/gnuradio/files/patch-gr-fcd_lib_CMakeLists.txt index 12b5645f683b..a24ae40a75ce 100644 --- a/comms/gnuradio/files/patch-gr-fcd_lib_CMakeLists.txt +++ b/comms/gnuradio/files/patch-gr-fcd_lib_CMakeLists.txt @@ -1,4 +1,4 @@ ---- gr-fcd/lib/CMakeLists.txt.orig 2015-05-12 09:39:44 UTC +--- gr-fcd/lib/CMakeLists.txt.orig 2015-04-13 14:32:43 UTC +++ gr-fcd/lib/CMakeLists.txt @@ -32,6 +32,7 @@ include_directories( ${GNURADIO_RUNTIME_INCLUDE_DIRS} diff --git a/comms/gnuradio/files/patch-gr-fcd_lib_hid_hid-libusb.c b/comms/gnuradio/files/patch-gr-fcd_lib_hid_hid-libusb.c index d32d0806d4d7..a85873abf7d1 100644 --- a/comms/gnuradio/files/patch-gr-fcd_lib_hid_hid-libusb.c +++ b/comms/gnuradio/files/patch-gr-fcd_lib_hid_hid-libusb.c @@ -1,4 +1,4 @@ ---- gr-fcd/lib/hid/hid-libusb.c.orig 2015-05-12 09:39:44 UTC +--- gr-fcd/lib/hid/hid-libusb.c.orig 2015-04-13 14:32:43 UTC +++ gr-fcd/lib/hid/hid-libusb.c @@ -250,8 +250,8 @@ static int get_usage(uint8_t *report_des } diff --git a/comms/gnuradio/files/patch-gr-fft_doc_CMakeLists.txt b/comms/gnuradio/files/patch-gr-fft_doc_CMakeLists.txt deleted file mode 100644 index 7b4cdef47774..000000000000 --- a/comms/gnuradio/files/patch-gr-fft_doc_CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ ---- gr-fft/doc/CMakeLists.txt.orig 2015-05-12 09:39:44 UTC -+++ gr-fft/doc/CMakeLists.txt -@@ -17,7 +17,9 @@ - # the Free Software Foundation, Inc., 51 Franklin Street, - # Boston, MA 02110-1301, USA. - -+if(ENABLE_DOCS) - install( - FILES README.fft - DESTINATION ${GR_PKG_DOC_DIR} - ) -+endif(ENABLE_DOCS) diff --git a/comms/gnuradio/files/patch-gr-filter_doc_CMakeLists.txt b/comms/gnuradio/files/patch-gr-filter_doc_CMakeLists.txt deleted file mode 100644 index 4a5b63e6bb7f..000000000000 --- a/comms/gnuradio/files/patch-gr-filter_doc_CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ ---- gr-filter/doc/CMakeLists.txt.orig 2015-05-12 09:39:44 UTC -+++ gr-filter/doc/CMakeLists.txt -@@ -17,7 +17,9 @@ - # the Free Software Foundation, Inc., 51 Franklin Street, - # Boston, MA 02110-1301, USA. - -+if(ENABLE_DOCS) - install( - FILES README.filter - DESTINATION ${GR_PKG_DOC_DIR} - ) -+endif(ENABLE_DOCS) diff --git a/comms/gnuradio/files/patch-gr-qtgui_CMakeLists.txt b/comms/gnuradio/files/patch-gr-qtgui_CMakeLists.txt deleted file mode 100644 index 89a85755b774..000000000000 --- a/comms/gnuradio/files/patch-gr-qtgui_CMakeLists.txt +++ /dev/null @@ -1,31 +0,0 @@ ---- gr-qtgui/CMakeLists.txt.orig 2015-05-12 09:39:44 UTC -+++ gr-qtgui/CMakeLists.txt -@@ -127,18 +127,27 @@ configure_file( - - install( - FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-qtgui.pc -- DESTINATION ${GR_LIBRARY_DIR}/pkgconfig -+ DESTINATION ${GR_PKGCONFIG_DIR}/pkgconfig - COMPONENT "qtgui_devel" - ) - - ######################################################################## - # Install the conf file - ######################################################################## -+if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") -+install( -+ FILES ${CMAKE_CURRENT_SOURCE_DIR}/gr-qtgui.conf -+ DESTINATION ${GR_PREFSDIR} -+ RENAME "gr-qtgui.conf.sample" -+ COMPONENT "qtgui" -+) -+elseif() - install( - FILES ${CMAKE_CURRENT_SOURCE_DIR}/gr-qtgui.conf - DESTINATION ${GR_PREFSDIR} - COMPONENT "qtgui" - ) -+endif() - - - ######################################################################## diff --git a/comms/gnuradio/files/patch-gr-qtgui_doc_CMakeLists.txt b/comms/gnuradio/files/patch-gr-qtgui_doc_CMakeLists.txt deleted file mode 100644 index 3ec3bf49e0df..000000000000 --- a/comms/gnuradio/files/patch-gr-qtgui_doc_CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ ---- gr-qtgui/doc/CMakeLists.txt.orig 2015-05-12 09:39:44 UTC -+++ gr-qtgui/doc/CMakeLists.txt -@@ -17,7 +17,9 @@ - # the Free Software Foundation, Inc., 51 Franklin Street, - # Boston, MA 02110-1301, USA. - -+if(ENABLE_DOCS) - install( - FILES README.qtgui - DESTINATION ${GR_PKG_DOC_DIR} - ) -+endif(ENABLE_DOCS) diff --git a/comms/gnuradio/files/patch-gr-trellis_doc_CMakeLists.txt b/comms/gnuradio/files/patch-gr-trellis_doc_CMakeLists.txt deleted file mode 100644 index 799806fb53d9..000000000000 --- a/comms/gnuradio/files/patch-gr-trellis_doc_CMakeLists.txt +++ /dev/null @@ -1,29 +0,0 @@ ---- gr-trellis/doc/CMakeLists.txt.orig 2015-05-12 09:39:44 UTC -+++ gr-trellis/doc/CMakeLists.txt -@@ -32,12 +32,14 @@ add_custom_command( - ${CMAKE_CURRENT_SOURCE_DIR}/gr-trellis.xml - ) - add_custom_target(gr_trellis_html ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/gr-trellis.html) -+if(ENABLE_DOCS) - install( - FILES ${CMAKE_CURRENT_BINARY_DIR}/gr-trellis.html - DESTINATION ${GR_PKG_DOC_DIR}/html - COMPONENT "trellis_docs" - - ) -+endif(ENABLE_DOCS) - endif(XMLTO_EXECUTABLE) - - ######################################################################## -@@ -65,9 +67,11 @@ add_custom_target(gr_trellis_xml ALL DEP - ${CMAKE_CURRENT_BINARY_DIR}/test_tcm.py.xml - ${CMAKE_CURRENT_BINARY_DIR}/test_viterbi_equalization1.py.xml - ) -+if(ENABLE_DOCS) - install(FILES - ${CMAKE_CURRENT_BINARY_DIR}/test_tcm.py.xml - ${CMAKE_CURRENT_BINARY_DIR}/test_viterbi_equalization1.py.xml - DESTINATION ${GR_PKG_DOC_DIR}/xml - COMPONENT "trellis_docs" - ) -+endif(ENABLE_DOCS) diff --git a/comms/gnuradio/files/patch-gr-uhd_CMakeLists.txt b/comms/gnuradio/files/patch-gr-uhd_CMakeLists.txt deleted file mode 100644 index 57839f3202cd..000000000000 --- a/comms/gnuradio/files/patch-gr-uhd_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- gr-uhd/CMakeLists.txt.orig 2015-05-12 09:39:44 UTC -+++ gr-uhd/CMakeLists.txt -@@ -116,7 +116,7 @@ configure_file( - - install( - FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-uhd.pc -- DESTINATION ${GR_LIBRARY_DIR}/pkgconfig -+ DESTINATION ${GR_PKGCONFIG_DIR}/pkgconfig - COMPONENT "uhd_devel" - ) - diff --git a/comms/gnuradio/files/patch-gr-uhd_doc_CMakeLists.txt b/comms/gnuradio/files/patch-gr-uhd_doc_CMakeLists.txt deleted file mode 100644 index 02344db161b7..000000000000 --- a/comms/gnuradio/files/patch-gr-uhd_doc_CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ ---- gr-uhd/doc/CMakeLists.txt.orig 2015-05-12 09:39:44 UTC -+++ gr-uhd/doc/CMakeLists.txt -@@ -17,7 +17,9 @@ - # the Free Software Foundation, Inc., 51 Franklin Street, - # Boston, MA 02110-1301, USA. - -+if(ENABLE_DOCS) - install( - FILES README.uhd - DESTINATION ${GR_PKG_DOC_DIR} - ) -+endif(ENABLE_DOCS) diff --git a/comms/gnuradio/files/patch-gr-utils_python_modtool_CMakeLists.txt b/comms/gnuradio/files/patch-gr-utils_python_modtool_CMakeLists.txt deleted file mode 100644 index 125a5395b38e..000000000000 --- a/comms/gnuradio/files/patch-gr-utils_python_modtool_CMakeLists.txt +++ /dev/null @@ -1,21 +0,0 @@ ---- gr-utils/python/modtool/CMakeLists.txt.orig 2015-05-12 09:39:44 UTC -+++ gr-utils/python/modtool/CMakeLists.txt -@@ -58,9 +58,17 @@ configure_file( - ${CMAKE_CURRENT_BINARY_DIR}/modtool.conf - @ONLY) - -+if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") - install( - FILES ${CMAKE_CURRENT_BINARY_DIR}/modtool.conf - DESTINATION ${GR_PREFSDIR} -+ RENAME "modtool.conf.sample" - COMPONENT "utils" - ) -- -+else() -+install( -+ FILES ${CMAKE_CURRENT_BINARY_DIR}/modtool.conf -+ DESTINATION ${GR_PREFSDIR} -+ COMPONENT "utils" -+) -+endif() diff --git a/comms/gnuradio/files/patch-gr-vocoder_doc_CMakeLists.txt b/comms/gnuradio/files/patch-gr-vocoder_doc_CMakeLists.txt deleted file mode 100644 index c3c578426b11..000000000000 --- a/comms/gnuradio/files/patch-gr-vocoder_doc_CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ ---- gr-vocoder/doc/CMakeLists.txt.orig 2015-05-12 09:39:44 UTC -+++ gr-vocoder/doc/CMakeLists.txt -@@ -17,7 +17,9 @@ - # the Free Software Foundation, Inc., 51 Franklin Street, - # Boston, MA 02110-1301, USA. - -+if(ENABLE_DOCS) - install( - FILES README.vocoder - DESTINATION ${GR_PKG_DOC_DIR} - ) -+endif(ENABLE_DOCS) diff --git a/comms/gnuradio/files/patch-gr-wxgui_CMakeLists.txt b/comms/gnuradio/files/patch-gr-wxgui_CMakeLists.txt deleted file mode 100644 index b66b3904813d..000000000000 --- a/comms/gnuradio/files/patch-gr-wxgui_CMakeLists.txt +++ /dev/null @@ -1,33 +0,0 @@ ---- gr-wxgui/CMakeLists.txt.orig 2015-05-12 09:39:44 UTC -+++ gr-wxgui/CMakeLists.txt -@@ -99,19 +99,28 @@ configure_file( - - install( - FILES ${CMAKE_CURRENT_BINARY_DIR}/gr-wxgui.pc -- DESTINATION ${GR_LIBRARY_DIR}/pkgconfig -+ DESTINATION ${GR_PKGCONFIG_DIR}/pkgconfig - COMPONENT "wxgui" - ) - - ######################################################################## - # Install the conf file - ######################################################################## -+# Install an original for FreeBSD -+if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") - install( - FILES ${CMAKE_CURRENT_SOURCE_DIR}/gr-wxgui.conf - DESTINATION ${GR_PREFSDIR} -+ RENAME "gr-wxgui.conf.sample" - COMPONENT "wxgui" - ) -- -+elseif() -+install( -+ FILES ${CMAKE_CURRENT_SOURCE_DIR}/gr-wxgui.conf -+ DESTINATION ${GR_PREFSDIR} -+ COMPONENT "wxgui" -+) -+endif() - ######################################################################## - # Add subdirectories - ######################################################################## diff --git a/comms/gnuradio/files/patch-grc_CMakeLists.txt b/comms/gnuradio/files/patch-grc_CMakeLists.txt deleted file mode 100644 index d9ca7bfd0387..000000000000 --- a/comms/gnuradio/files/patch-grc_CMakeLists.txt +++ /dev/null @@ -1,24 +0,0 @@ ---- grc/CMakeLists.txt.orig 2015-05-12 09:39:44 UTC -+++ grc/CMakeLists.txt -@@ -87,11 +87,21 @@ configure_file( - ${CMAKE_CURRENT_BINARY_DIR}/grc.conf - @ONLY) - -+if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") -+ install( -+ FILES ${CMAKE_CURRENT_BINARY_DIR}/grc.conf -+ DESTINATION ${GR_PREFSDIR} -+ RENAME "grc.conf.sample" -+ COMPONENT "grc" -+ ) -+ -+elseif() - install( - FILES ${CMAKE_CURRENT_BINARY_DIR}/grc.conf - DESTINATION ${GR_PREFSDIR} - COMPONENT "grc" - ) -+endif() - - GR_PYTHON_INSTALL( - FILES __init__.py diff --git a/comms/gnuradio/files/patch-grc_scripts_gnuradio-companion b/comms/gnuradio/files/patch-grc_scripts_gnuradio-companion index fd58554e25e6..6d4e74293a8b 100644 --- a/comms/gnuradio/files/patch-grc_scripts_gnuradio-companion +++ b/comms/gnuradio/files/patch-grc_scripts_gnuradio-companion @@ -1,13 +1,12 @@ ---- grc/scripts/gnuradio-companion.orig 2015-05-12 09:39:44 UTC +--- grc/scripts/gnuradio-companion.orig 2016-10-02 20:26:15 UTC +++ grc/scripts/gnuradio-companion -@@ -22,6 +22,10 @@ import os - import sys +@@ -23,6 +23,9 @@ import sys import optparse + import warnings -+# XXX workaround to make sure we import gcc47's libgcc_s.so not -+# the older one from base: -+from numpy.linalg import lapack_lite -+ - import pygtk - pygtk.require('2.0') - import gtk ++# XXX workaround to make sure we import gcc libgcc4 ++# the older one from base: ++from numpy.linalg import lapack_lite + + GR_IMPORT_ERROR_MESSAGE = """\ + Cannot import gnuradio. diff --git a/comms/gnuradio/files/patch-volk_CMakeLists.txt b/comms/gnuradio/files/patch-volk_CMakeLists.txt index 58aef64658a6..a3ecb96ba763 100644 --- a/comms/gnuradio/files/patch-volk_CMakeLists.txt +++ b/comms/gnuradio/files/patch-volk_CMakeLists.txt @@ -1,6 +1,6 @@ ---- volk/CMakeLists.txt.orig 2015-05-12 09:39:44 UTC -+++ volk/CMakeLists.txt -@@ -136,7 +136,7 @@ configure_file( +--- volk/CMakeLists.txt.orig 2016-10-08 18:42:16.000000000 -0400 ++++ volk/CMakeLists.txt 2016-10-08 18:45:51.000000000 -0400 +@@ -139,7 +139,7 @@ install( FILES ${CMAKE_CURRENT_BINARY_DIR}/volk.pc diff --git a/comms/gnuradio/files/patch-volk_tmpl_volk__cpu.tmpl.c b/comms/gnuradio/files/patch-volk_tmpl_volk__cpu.tmpl.c deleted file mode 100644 index a64dee1728d0..000000000000 --- a/comms/gnuradio/files/patch-volk_tmpl_volk__cpu.tmpl.c +++ /dev/null @@ -1,39 +0,0 @@ ---- volk/tmpl/volk_cpu.tmpl.c.orig 2015-07-09 02:00:33 UTC -+++ volk/tmpl/volk_cpu.tmpl.c -@@ -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 -+ #if defined(HAVE_CPUID_H) -+ #include -+ #else -+ #ifdef __FreeBSD__ -+#if __i386__ -+#define __cpuid(__level, __eax, __ebx, __ecx, __edx) \ -+ __asm("cpuid" : "=a"(__eax), "=b" (__ebx), "=c"(__ecx), "=d"(__edx) \ -+ : "0"(__level)) -+#else -+/* x86-64 uses %rbx as the base register, so preserve it. */ -+#define __cpuid(__level, __eax, __ebx, __ecx, __edx) \ -+ __asm(" xchgq %%rbx,%q1\n" \ -+ " cpuid\n" \ -+ " xchgq %%rbx,%q1" \ -+ : "=a"(__eax), "=r" (__ebx), "=c"(__ecx), "=d"(__edx) \ -+ : "0"(__level)) -+ -+#endif -+ -+static __inline int __get_cpuid (unsigned int __level, unsigned int *__eax, -+ unsigned int *__ebx, unsigned int *__ecx, -+ unsigned int *__edx) { -+ __cpuid(__level, *__eax, *__ebx, *__ecx, *__edx); -+ return 1; -+} -+ #else -+ #include "gcc_x86_cpuid.h" -+ #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 --git a/comms/gnuradio/pkg-descr b/comms/gnuradio/pkg-descr index 6458eff9f44c..e212d38253c5 100644 --- a/comms/gnuradio/pkg-descr +++ b/comms/gnuradio/pkg-descr @@ -2,6 +2,6 @@ GNU Radio is a collection of software that when combined with 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 diff --git a/comms/gnuradio/pkg-plist b/comms/gnuradio/pkg-plist index 53db088964f8..3bbbe5c315fb 100644 --- a/comms/gnuradio/pkg-plist +++ b/comms/gnuradio/pkg-plist @@ -1,68 +1,69 @@ -%%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 -%%QT_BINDIR%%/gr_plot_fft_c -%%QT_BINDIR%%/gr_plot_fft_f -%%QT_BINDIR%%/gr_plot_float -%%QT_BINDIR%%/gr_plot_int -%%QT_BINDIR%%/gr_plot_iq -%%QT_BINDIR%%/gr_plot_psd -%%QT_BINDIR%%/gr_plot_psd_c -%%QT_BINDIR%%/gr_plot_psd_f -%%QT_BINDIR%%/gr_plot_qt -%%QT_BINDIR%%/gr_plot_short -%%QT_BINDIR%%/gr_psd_plot_b -%%QT_BINDIR%%/gr_psd_plot_c -%%QT_BINDIR%%/gr_psd_plot_f -%%QT_BINDIR%%/gr_psd_plot_i -%%QT_BINDIR%%/gr_psd_plot_s -%%QT_BINDIR%%/gr_read_file_metadata -%%QT_BINDIR%%/gr_spectrogram_plot -%%QT_BINDIR%%/gr_spectrogram_plot_b -%%QT_BINDIR%%/gr_spectrogram_plot_c -%%QT_BINDIR%%/gr_spectrogram_plot_f -%%QT_BINDIR%%/gr_spectrogram_plot_i -%%QT_BINDIR%%/gr_spectrogram_plot_s -%%QT_BINDIR%%/gr_time_plot_b -%%QT_BINDIR%%/gr_time_plot_c -%%QT_BINDIR%%/gr_time_plot_f -%%QT_BINDIR%%/gr_time_plot_i -%%QT_BINDIR%%/gr_time_plot_s -%%QT_BINDIR%%/gr_time_raster_b -%%QT_BINDIR%%/gr_time_raster_f -%%QT_BINDIR%%/grcc -%%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 -%%QT_BINDIR%%/volk-config-info -%%QT_BINDIR%%/volk_modtool -%%QT_BINDIR%%/volk_profile +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_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 +%%UHD%%bin/uhd_rx_cfile +%%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 %%ETCDIR%%/conf.d/gnuradio-runtime.conf -@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 +@sample %%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 include/gnuradio/analog/agc.h include/gnuradio/analog/agc2.h include/gnuradio/analog/agc2_cc.h @@ -98,6 +99,9 @@ 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 @@ -233,6 +237,7 @@ include/gnuradio/blocks/complex_to_imag.h include/gnuradio/blocks/complex_to_interleaved_short.h include/gnuradio/blocks/complex_to_mag.h include/gnuradio/blocks/complex_to_mag_squared.h +include/gnuradio/blocks/complex_to_magphase.h include/gnuradio/blocks/complex_to_real.h include/gnuradio/blocks/conjugate_cc.h include/gnuradio/blocks/control_loop.h @@ -278,6 +283,7 @@ include/gnuradio/blocks/lfsr_15_1_0.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 @@ -541,15 +547,6 @@ 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 @@ -560,6 +557,23 @@ include/gnuradio/dtv/dvbt2_modulator_bc.h include/gnuradio/dtv/dvbt2_p1insertion_cc.h include/gnuradio/dtv/dvbt2_paprtr_cc.h include/gnuradio/dtv/dvbt2_pilotgenerator_cc.h +include/gnuradio/dtv/dvbt_bit_inner_deinterleaver.h +include/gnuradio/dtv/dvbt_bit_inner_interleaver.h +include/gnuradio/dtv/dvbt_config.h +include/gnuradio/dtv/dvbt_convolutional_deinterleaver.h +include/gnuradio/dtv/dvbt_convolutional_interleaver.h +include/gnuradio/dtv/dvbt_demap.h +include/gnuradio/dtv/dvbt_demod_reference_signals.h +include/gnuradio/dtv/dvbt_energy_descramble.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_ofdm_sym_acquisition.h +include/gnuradio/dtv/dvbt_reed_solomon_dec.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/dvbt_viterbi_decoder.h include/gnuradio/endianness.h include/gnuradio/expj.h include/gnuradio/fcd/api.h @@ -580,8 +594,23 @@ include/gnuradio/fec/dummy_decoder.h include/gnuradio/fec/dummy_encoder.h include/gnuradio/fec/encode_ccsds_27_bb.h include/gnuradio/fec/encoder.h +include/gnuradio/fec/fec_mtrx.h include/gnuradio/fec/generic_decoder.h include/gnuradio/fec/generic_encoder.h +include/gnuradio/fec/ldpc_G_matrix.h +include/gnuradio/fec/ldpc_H_matrix.h +include/gnuradio/fec/ldpc_bit_flip_decoder.h +include/gnuradio/fec/ldpc_decoder.h +include/gnuradio/fec/ldpc_encoder.h +include/gnuradio/fec/ldpc_gen_mtrx_encoder.h +include/gnuradio/fec/ldpc_par_mtrx_encoder.h +include/gnuradio/fec/polar_common.h +include/gnuradio/fec/polar_decoder_common.h +include/gnuradio/fec/polar_decoder_sc.h +include/gnuradio/fec/polar_decoder_sc_list.h +include/gnuradio/fec/polar_decoder_sc_systematic.h +include/gnuradio/fec/polar_encoder.h +include/gnuradio/fec/polar_encoder_systematic.h include/gnuradio/fec/puncture_bb.h include/gnuradio/fec/puncture_ff.h include/gnuradio/fec/repetition_decoder.h @@ -838,8 +867,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 -%%USRP%%include/gnuradio/swig/uhd_swig.i -%%USRP%%include/gnuradio/swig/uhd_swig_doc.i +%%UHD%%include/gnuradio/swig/uhd_swig.i +%%UHD%%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 @@ -929,11 +958,11 @@ include/gnuradio/trellis/viterbi_combined_ss.h include/gnuradio/trellis/viterbi_i.h include/gnuradio/trellis/viterbi_s.h include/gnuradio/types.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 +%%UHD%%include/gnuradio/uhd/amsg_source.h +%%UHD%%include/gnuradio/uhd/api.h +%%UHD%%include/gnuradio/uhd/usrp_block.h +%%UHD%%include/gnuradio/uhd/usrp_sink.h +%%UHD%%include/gnuradio/uhd/usrp_source.h include/gnuradio/unittests.h include/gnuradio/video_sdl/api.h include/gnuradio/video_sdl/sink_s.h @@ -972,6 +1001,8 @@ include/pmt/pmt_pool.h include/pmt/pmt_serial_tags.h include/pmt/pmt_sugar.h include/volk/volk.h +include/volk/volk_32f_8u_polarbutterfly_32f.h +include/volk/volk_32f_8u_polarbutterflypuppet_32f.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 @@ -990,12 +1021,12 @@ 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_32f_binary_slicer_32i.h +include/volk/volk_32f_binary_slicer_8i.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 @@ -1080,13 +1111,19 @@ include/volk/volk_8ic_s32f_deinterleave_real_32f.h include/volk/volk_8ic_x2_multiply_conjugate_16ic.h include/volk/volk_8ic_x2_s32f_multiply_conjugate_32fc.h include/volk/volk_8u_conv_k7_r2puppet_8u.h +include/volk/volk_8u_x3_encodepolar_8u_x2.h +include/volk/volk_8u_x3_encodepolarpuppet_8u.h +include/volk/volk_8u_x2_encodeframepolar_8u.h include/volk/volk_8u_x4_conv_k7_r2_8u.h +include/volk/volk_avx_intrinsics.h include/volk/volk_common.h include/volk/volk_complex.h include/volk/volk_config_fixed.h include/volk/volk_cpu.h include/volk/volk_malloc.h +include/volk/volk_neon_intrinsics.h include/volk/volk_prefs.h +include/volk/volk_sse3_intrinsics.h include/volk/volk_typedefs.h lib/cmake/gnuradio/CMakeMacroLibtoolFile.cmake lib/cmake/gnuradio/CMakeParseArgumentsCopy.cmake @@ -1124,73 +1161,73 @@ lib/cmake/gnuradio/UseSWIG.cmake lib/cmake/volk/VolkConfig.cmake lib/cmake/volk/VolkConfigVersion.cmake lib/libgnuradio-analog.so -lib/libgnuradio-analog.so.%%MAJOR_VERSION%% lib/libgnuradio-analog.so.%%MAJOR_SUB_VER%% +lib/libgnuradio-analog.so.%%MAJOR_VERSION%% lib/libgnuradio-atsc.so -lib/libgnuradio-atsc.so.%%MAJOR_VERSION%% lib/libgnuradio-atsc.so.%%MAJOR_SUB_VER%% +lib/libgnuradio-atsc.so.%%MAJOR_VERSION%% lib/libgnuradio-audio.so -lib/libgnuradio-audio.so.%%MAJOR_VERSION%% lib/libgnuradio-audio.so.%%MAJOR_SUB_VER%% +lib/libgnuradio-audio.so.%%MAJOR_VERSION%% lib/libgnuradio-blocks.so -lib/libgnuradio-blocks.so.%%MAJOR_VERSION%% lib/libgnuradio-blocks.so.%%MAJOR_SUB_VER%% +lib/libgnuradio-blocks.so.%%MAJOR_VERSION%% lib/libgnuradio-channels.so -lib/libgnuradio-channels.so.%%MAJOR_VERSION%% lib/libgnuradio-channels.so.%%MAJOR_SUB_VER%% +lib/libgnuradio-channels.so.%%MAJOR_VERSION%% lib/libgnuradio-digital.so -lib/libgnuradio-digital.so.%%MAJOR_VERSION%% lib/libgnuradio-digital.so.%%MAJOR_SUB_VER%% +lib/libgnuradio-digital.so.%%MAJOR_VERSION%% lib/libgnuradio-dtv.so -lib/libgnuradio-dtv.so.%%MAJOR_VERSION%% lib/libgnuradio-dtv.so.%%MAJOR_SUB_VER%% +lib/libgnuradio-dtv.so.%%MAJOR_VERSION%% lib/libgnuradio-fcd.so -lib/libgnuradio-fcd.so.%%MAJOR_VERSION%% lib/libgnuradio-fcd.so.%%MAJOR_SUB_VER%% +lib/libgnuradio-fcd.so.%%MAJOR_VERSION%% lib/libgnuradio-fec.so -lib/libgnuradio-fec.so.%%MAJOR_VERSION%% lib/libgnuradio-fec.so.%%MAJOR_SUB_VER%% +lib/libgnuradio-fec.so.%%MAJOR_VERSION%% lib/libgnuradio-fft.so -lib/libgnuradio-fft.so.%%MAJOR_VERSION%% lib/libgnuradio-fft.so.%%MAJOR_SUB_VER%% +lib/libgnuradio-fft.so.%%MAJOR_VERSION%% lib/libgnuradio-filter.so -lib/libgnuradio-filter.so.%%MAJOR_VERSION%% lib/libgnuradio-filter.so.%%MAJOR_SUB_VER%% +lib/libgnuradio-filter.so.%%MAJOR_VERSION%% lib/libgnuradio-noaa.so -lib/libgnuradio-noaa.so.%%MAJOR_VERSION%% lib/libgnuradio-noaa.so.%%MAJOR_SUB_VER%% +lib/libgnuradio-noaa.so.%%MAJOR_VERSION%% lib/libgnuradio-pager.so -lib/libgnuradio-pager.so.%%MAJOR_VERSION%% lib/libgnuradio-pager.so.%%MAJOR_SUB_VER%% +lib/libgnuradio-pager.so.%%MAJOR_VERSION%% lib/libgnuradio-pmt.so -lib/libgnuradio-pmt.so.%%MAJOR_VERSION%% lib/libgnuradio-pmt.so.%%MAJOR_SUB_VER%% +lib/libgnuradio-pmt.so.%%MAJOR_VERSION%% lib/libgnuradio-qtgui.so -lib/libgnuradio-qtgui.so.%%MAJOR_VERSION%% lib/libgnuradio-qtgui.so.%%MAJOR_SUB_VER%% +lib/libgnuradio-qtgui.so.%%MAJOR_VERSION%% lib/libgnuradio-runtime.so -lib/libgnuradio-runtime.so.%%MAJOR_VERSION%% lib/libgnuradio-runtime.so.%%MAJOR_SUB_VER%% +lib/libgnuradio-runtime.so.%%MAJOR_VERSION%% lib/libgnuradio-trellis.so -lib/libgnuradio-trellis.so.%%MAJOR_VERSION%% lib/libgnuradio-trellis.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-trellis.so.%%MAJOR_VERSION%% +%%UHD%%lib/libgnuradio-uhd.so +%%UHD%%lib/libgnuradio-uhd.so.%%MAJOR_SUB_VER%% +%%UHD%%lib/libgnuradio-uhd.so.%%MAJOR_VERSION%% lib/libgnuradio-video-sdl.so -lib/libgnuradio-video-sdl.so.%%MAJOR_VERSION%% lib/libgnuradio-video-sdl.so.%%MAJOR_SUB_VER%% +lib/libgnuradio-video-sdl.so.%%MAJOR_VERSION%% lib/libgnuradio-vocoder.so -lib/libgnuradio-vocoder.so.%%MAJOR_VERSION%% lib/libgnuradio-vocoder.so.%%MAJOR_SUB_VER%% +lib/libgnuradio-vocoder.so.%%MAJOR_VERSION%% lib/libgnuradio-wavelet.so -lib/libgnuradio-wavelet.so.%%MAJOR_VERSION%% lib/libgnuradio-wavelet.so.%%MAJOR_SUB_VER%% +lib/libgnuradio-wavelet.so.%%MAJOR_VERSION%% lib/libgnuradio-wxgui.so -lib/libgnuradio-wxgui.so.%%MAJOR_VERSION%% lib/libgnuradio-wxgui.so.%%MAJOR_SUB_VER%% +lib/libgnuradio-wxgui.so.%%MAJOR_VERSION%% lib/libvolk.so -lib/libvolk.so.1.0.2 +lib/libvolk.so.1.2.2 %%PYTHON_SITELIBDIR%%/gnuradio/__init__.py %%PYTHON_SITELIBDIR%%/gnuradio/__init__.pyc %%PYTHON_SITELIBDIR%%/gnuradio/__init__.pyo @@ -1460,6 +1497,15 @@ lib/libvolk.so.1.0.2 %%PYTHON_SITELIBDIR%%/gnuradio/fcd/fcd_swig.py %%PYTHON_SITELIBDIR%%/gnuradio/fcd/fcd_swig.pyc %%PYTHON_SITELIBDIR%%/gnuradio/fcd/fcd_swig.pyo +%%PYTHON_SITELIBDIR%%/gnuradio/fec/LDPC/Generate_LDPC_matrix.py +%%PYTHON_SITELIBDIR%%/gnuradio/fec/LDPC/Generate_LDPC_matrix.pyc +%%PYTHON_SITELIBDIR%%/gnuradio/fec/LDPC/Generate_LDPC_matrix.pyo +%%PYTHON_SITELIBDIR%%/gnuradio/fec/LDPC/Generate_LDPC_matrix_functions.py +%%PYTHON_SITELIBDIR%%/gnuradio/fec/LDPC/Generate_LDPC_matrix_functions.pyc +%%PYTHON_SITELIBDIR%%/gnuradio/fec/LDPC/Generate_LDPC_matrix_functions.pyo +%%PYTHON_SITELIBDIR%%/gnuradio/fec/LDPC/__init__.py +%%PYTHON_SITELIBDIR%%/gnuradio/fec/LDPC/__init__.pyc +%%PYTHON_SITELIBDIR%%/gnuradio/fec/LDPC/__init__.pyo %%PYTHON_SITELIBDIR%%/gnuradio/fec/__init__.py %%PYTHON_SITELIBDIR%%/gnuradio/fec/__init__.pyc %%PYTHON_SITELIBDIR%%/gnuradio/fec/__init__.pyo @@ -1497,6 +1543,21 @@ lib/libvolk.so.1.0.2 %%PYTHON_SITELIBDIR%%/gnuradio/fec/fec_test.py %%PYTHON_SITELIBDIR%%/gnuradio/fec/fec_test.pyc %%PYTHON_SITELIBDIR%%/gnuradio/fec/fec_test.pyo +%%PYTHON_SITELIBDIR%%/gnuradio/fec/polar/__init__.py +%%PYTHON_SITELIBDIR%%/gnuradio/fec/polar/__init__.pyc +%%PYTHON_SITELIBDIR%%/gnuradio/fec/polar/__init__.pyo +%%PYTHON_SITELIBDIR%%/gnuradio/fec/polar/channel_construction.py +%%PYTHON_SITELIBDIR%%/gnuradio/fec/polar/channel_construction.pyc +%%PYTHON_SITELIBDIR%%/gnuradio/fec/polar/channel_construction.pyo +%%PYTHON_SITELIBDIR%%/gnuradio/fec/polar/channel_construction_awgn.py +%%PYTHON_SITELIBDIR%%/gnuradio/fec/polar/channel_construction_awgn.pyc +%%PYTHON_SITELIBDIR%%/gnuradio/fec/polar/channel_construction_awgn.pyo +%%PYTHON_SITELIBDIR%%/gnuradio/fec/polar/channel_construction_bec.py +%%PYTHON_SITELIBDIR%%/gnuradio/fec/polar/channel_construction_bec.pyc +%%PYTHON_SITELIBDIR%%/gnuradio/fec/polar/channel_construction_bec.pyo +%%PYTHON_SITELIBDIR%%/gnuradio/fec/polar/helper_functions.py +%%PYTHON_SITELIBDIR%%/gnuradio/fec/polar/helper_functions.pyc +%%PYTHON_SITELIBDIR%%/gnuradio/fec/polar/helper_functions.pyo %%PYTHON_SITELIBDIR%%/gnuradio/fec/threaded_decoder.py %%PYTHON_SITELIBDIR%%/gnuradio/fec/threaded_decoder.pyc %%PYTHON_SITELIBDIR%%/gnuradio/fec/threaded_decoder.pyo @@ -1716,6 +1777,9 @@ lib/libvolk.so.1.0.2 %%PYTHON_SITELIBDIR%%/gnuradio/grc/gui/__init__.py %%PYTHON_SITELIBDIR%%/gnuradio/grc/gui/__init__.pyc %%PYTHON_SITELIBDIR%%/gnuradio/grc/gui/__init__.pyo +%%PYTHON_SITELIBDIR%%/gnuradio/grc/gui/external_editor.py +%%PYTHON_SITELIBDIR%%/gnuradio/grc/gui/external_editor.pyc +%%PYTHON_SITELIBDIR%%/gnuradio/grc/gui/external_editor.pyo %%PYTHON_SITELIBDIR%%/gnuradio/grc/python/Block.py %%PYTHON_SITELIBDIR%%/gnuradio/grc/python/Block.pyc %%PYTHON_SITELIBDIR%%/gnuradio/grc/python/Block.pyo @@ -1745,6 +1809,9 @@ lib/libvolk.so.1.0.2 %%PYTHON_SITELIBDIR%%/gnuradio/grc/python/__init__.pyo %%PYTHON_SITELIBDIR%%/gnuradio/grc/python/block.dtd %%PYTHON_SITELIBDIR%%/gnuradio/grc/python/default_flow_graph.grc +%%PYTHON_SITELIBDIR%%/gnuradio/grc/python/epy_block_io.py +%%PYTHON_SITELIBDIR%%/gnuradio/grc/python/epy_block_io.pyc +%%PYTHON_SITELIBDIR%%/gnuradio/grc/python/epy_block_io.pyo %%PYTHON_SITELIBDIR%%/gnuradio/grc/python/expr_utils.py %%PYTHON_SITELIBDIR%%/gnuradio/grc/python/expr_utils.pyc %%PYTHON_SITELIBDIR%%/gnuradio/grc/python/expr_utils.pyo @@ -1924,16 +1991,19 @@ lib/libvolk.so.1.0.2 %%PYTHON_SITELIBDIR%%/gnuradio/trellis/trellis_swig.py %%PYTHON_SITELIBDIR%%/gnuradio/trellis/trellis_swig.pyc %%PYTHON_SITELIBDIR%%/gnuradio/trellis/trellis_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 +%%UHD%%%%PYTHON_SITELIBDIR%%/gnuradio/uhd/__init__.py +%%UHD%%%%PYTHON_SITELIBDIR%%/gnuradio/uhd/__init__.pyc +%%UHD%%%%PYTHON_SITELIBDIR%%/gnuradio/uhd/__init__.pyo +%%UHD%%%%PYTHON_SITELIBDIR%%/gnuradio/uhd/_uhd_swig.so +%%UHD%%%%PYTHON_SITELIBDIR%%/gnuradio/uhd/uhd_app.py +%%UHD%%%%PYTHON_SITELIBDIR%%/gnuradio/uhd/uhd_app.pyc +%%UHD%%%%PYTHON_SITELIBDIR%%/gnuradio/uhd/uhd_app.pyo +%%UHD%%%%PYTHON_SITELIBDIR%%/gnuradio/uhd/uhd_siggen_base.py +%%UHD%%%%PYTHON_SITELIBDIR%%/gnuradio/uhd/uhd_siggen_base.pyc +%%UHD%%%%PYTHON_SITELIBDIR%%/gnuradio/uhd/uhd_siggen_base.pyo +%%UHD%%%%PYTHON_SITELIBDIR%%/gnuradio/uhd/uhd_swig.py +%%UHD%%%%PYTHON_SITELIBDIR%%/gnuradio/uhd/uhd_swig.pyc +%%UHD%%%%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 @@ -2144,7 +2214,6 @@ libdata/pkgconfig/gnuradio-pager.pc libdata/pkgconfig/gnuradio-qtgui.pc libdata/pkgconfig/gnuradio-runtime.pc libdata/pkgconfig/gnuradio-trellis.pc -%%USRP%%libdata/pkgconfig/gnuradio-uhd.pc libdata/pkgconfig/gnuradio-video-sdl.pc libdata/pkgconfig/gnuradio-vocoder.pc libdata/pkgconfig/gnuradio-wavelet.pc @@ -2180,6 +2249,12 @@ 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/ctrlport/comparing_resamplers.grc +%%DATADIR%%/examples/ctrlport/pfb_sync_test.grc +%%DATADIR%%/examples/ctrlport/simple_copy.grc +%%DATADIR%%/examples/ctrlport/simple_copy_controller.py +%%DATADIR%%/examples/ctrlport/usrp_source_control.grc +%%DATADIR%%/examples/ctrlport/usrp_source_controller.py %%DATADIR%%/examples/digital/burst_shaper.grc %%DATADIR%%/examples/digital/demod/ber_simulation.grc %%DATADIR%%/examples/digital/demod/constellation_soft_decoder.grc @@ -2224,17 +2299,23 @@ 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.3.112 %%DATADIR%%/examples/fec/ber_curve_gen.grc +%%DATADIR%%/examples/fec/ber_curve_gen_ldpc.grc %%DATADIR%%/examples/fec/ber_test.grc %%DATADIR%%/examples/fec/fecapi_async_decoders.grc %%DATADIR%%/examples/fec/fecapi_async_encoders.grc %%DATADIR%%/examples/fec/fecapi_async_packed_decoders.grc %%DATADIR%%/examples/fec/fecapi_async_to_stream.grc +%%DATADIR%%/examples/fec/fecapi_cc_decoders.grc %%DATADIR%%/examples/fec/fecapi_decoders.grc %%DATADIR%%/examples/fec/fecapi_encoders.grc +%%DATADIR%%/examples/fec/fecapi_polar_async_packed_decoders.grc +%%DATADIR%%/examples/fec/fecapi_polar_decoders.grc +%%DATADIR%%/examples/fec/fecapi_polar_encoders.grc %%DATADIR%%/examples/fec/fecapi_tagged_decoders.grc %%DATADIR%%/examples/fec/fecapi_tagged_encoders.grc +%%DATADIR%%/examples/fec/polar_ber_curve_gen.grc +%%DATADIR%%/examples/fec/polar_code_example.grc %%DATADIR%%/examples/fec/tpc_ber_curve_gen.grc %%DATADIR%%/examples/filter/channelize.py %%DATADIR%%/examples/filter/chirp_channelize.py @@ -2258,20 +2339,6 @@ 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 -%%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 @@ -2305,7 +2372,9 @@ libexec/gnuradio/grc_setup_freedesktop %%DATADIR%%/examples/qt-gui/pyqt_time_raster_f.py %%DATADIR%%/examples/qt-gui/pyqt_waterfall_c.py %%DATADIR%%/examples/qt-gui/pyqt_waterfall_f.py +%%DATADIR%%/examples/qt-gui/qtgui_message_inputs.grc %%DATADIR%%/examples/qt-gui/qtgui_tags_viewing.grc +%%DATADIR%%/examples/qt-gui/qtgui_vector_sink_example.grc %%DATADIR%%/examples/tags/test_file_tags.py %%DATADIR%%/examples/tags/uhd_burst_detector.py %%DATADIR%%/examples/trellis/README @@ -2350,30 +2419,6 @@ libexec/gnuradio/grc_setup_freedesktop %%DATADIR%%/examples/trellis/test_tcm.py %%DATADIR%%/examples/trellis/turbo_equalization.grc %%DATADIR%%/examples/trellis/viterbi_equalization.grc -%%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 @@ -2387,6 +2432,25 @@ libexec/gnuradio/grc_setup_freedesktop %%DATADIR%%/examples/volk_benchmark/volk_plot.py %%DATADIR%%/examples/volk_benchmark/volk_test_funcs.py %%DATADIR%%/examples/volk_benchmark/volk_types.py +%%DATADIR%%/fec/ldpc/271.127.3.112 +%%DATADIR%%/fec/ldpc/PNB2_512_23C1.alist +%%DATADIR%%/fec/ldpc/n_0300_k_0103_gap_24.alist +%%DATADIR%%/fec/ldpc/n_0300_k_0122_gap_06.alist +%%DATADIR%%/fec/ldpc/n_0300_k_0152_gap_03.alist +%%DATADIR%%/fec/ldpc/n_0100_k_0023_gap_10.alist +%%DATADIR%%/fec/ldpc/n_0100_k_0027_gap_04.alist +%%DATADIR%%/fec/ldpc/n_0100_k_0042_gap_02.alist +%%DATADIR%%/fec/ldpc/n_0100_k_0058_gen_matrix.alist +%%DATADIR%%/fec/ldpc/n_0500_k_0127_gap_21.alist +%%DATADIR%%/fec/ldpc/n_0500_k_0202_gap_11.alist +%%DATADIR%%/fec/ldpc/n_0512_k_0130_gap_21.alist +%%DATADIR%%/fec/ldpc/n_0700_k_0282_gap_16.alist +%%DATADIR%%/fec/ldpc/n_1300_k_0522_gap_30.alist +%%DATADIR%%/fec/ldpc/n_1100_k_0442_gap_24.alist +%%DATADIR%%/fec/ldpc/n_1800_k_0902_gap_28.alist +%%DATADIR%%/fec/ldpc/n_2400_k_1198_gap_33.alist +%%DATADIR%%/fec/ldpc/n_2400_k_1198_gen_matrix.alist +%%DATADIR%%/fec/ldpc/simple_g_matrix.alist %%DATADIR%%/grc/blocks/analog_agc2_xx.xml %%DATADIR%%/grc/blocks/analog_agc3_xx.xml %%DATADIR%%/grc/blocks/analog_agc_xx.xml @@ -2414,6 +2478,7 @@ libexec/gnuradio/grc_setup_freedesktop %%DATADIR%%/grc/blocks/analog_quadrature_demod_cf.xml %%DATADIR%%/grc/blocks/analog_rail_ff.xml %%DATADIR%%/grc/blocks/analog_random_source_x.xml +%%DATADIR%%/grc/blocks/analog_random_uniform_source_x.xml %%DATADIR%%/grc/blocks/analog_sig_source_x.xml %%DATADIR%%/grc/blocks/analog_simple_squelch_cc.xml %%DATADIR%%/grc/blocks/analog_standard_squelch.xml @@ -2443,9 +2508,11 @@ libexec/gnuradio/grc_setup_freedesktop %%DATADIR%%/grc/blocks/blocks_complex_to_arg.xml %%DATADIR%%/grc/blocks/blocks_complex_to_float.xml %%DATADIR%%/grc/blocks/blocks_complex_to_imag.xml +%%DATADIR%%/grc/blocks/blocks_complex_to_interleaved_char.xml %%DATADIR%%/grc/blocks/blocks_complex_to_interleaved_short.xml %%DATADIR%%/grc/blocks/blocks_complex_to_mag.xml %%DATADIR%%/grc/blocks/blocks_complex_to_mag_squared.xml +%%DATADIR%%/grc/blocks/blocks_complex_to_magphase.xml %%DATADIR%%/grc/blocks/blocks_complex_to_real.xml %%DATADIR%%/grc/blocks/blocks_conjugate_cc.xml %%DATADIR%%/grc/blocks/blocks_copy.xml @@ -2477,6 +2544,7 @@ libexec/gnuradio/grc_setup_freedesktop %%DATADIR%%/grc/blocks/blocks_interleaved_short_to_complex.xml %%DATADIR%%/grc/blocks/blocks_keep_m_in_n.xml %%DATADIR%%/grc/blocks/blocks_keep_one_in_n.xml +%%DATADIR%%/grc/blocks/blocks_magphase_to_complex.xml %%DATADIR%%/grc/blocks/blocks_max_xx.xml %%DATADIR%%/grc/blocks/blocks_message_burst_source.xml %%DATADIR%%/grc/blocks/blocks_message_debug.xml @@ -2681,14 +2749,6 @@ 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 @@ -2698,7 +2758,25 @@ libexec/gnuradio/grc_setup_freedesktop %%DATADIR%%/grc/blocks/dtv_dvbt2_p1insertion_cc.xml %%DATADIR%%/grc/blocks/dtv_dvbt2_paprtr_cc.xml %%DATADIR%%/grc/blocks/dtv_dvbt2_pilotgenerator_cc.xml +%%DATADIR%%/grc/blocks/dtv_dvbt_bit_inner_deinterleaver.xml +%%DATADIR%%/grc/blocks/dtv_dvbt_bit_inner_interleaver.xml +%%DATADIR%%/grc/blocks/dtv_dvbt_convolutional_deinterleaver.xml +%%DATADIR%%/grc/blocks/dtv_dvbt_convolutional_interleaver.xml +%%DATADIR%%/grc/blocks/dtv_dvbt_demap.xml +%%DATADIR%%/grc/blocks/dtv_dvbt_demod_reference_signals.xml +%%DATADIR%%/grc/blocks/dtv_dvbt_energy_descramble.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_ofdm_sym_acquisition.xml +%%DATADIR%%/grc/blocks/dtv_dvbt_reed_solomon_dec.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_dvbt_viterbi_decoder.xml %%DATADIR%%/grc/blocks/dummy.xml +%%DATADIR%%/grc/blocks/epy_block.xml +%%DATADIR%%/grc/blocks/epy_module.xml %%DATADIR%%/grc/blocks/fcd_source_c.xml %%DATADIR%%/grc/blocks/fec_async_decoder.xml %%DATADIR%%/grc/blocks/fec_async_encoder.xml @@ -2789,21 +2867,17 @@ libexec/gnuradio/grc_setup_freedesktop %%DATADIR%%/grc/blocks/tpc_encoder_def_list.xml %%DATADIR%%/grc/blocks/trellis_encoder_xx.xml %%DATADIR%%/grc/blocks/trellis_metrics_x.xml -%%DATADIR%%/grc/blocks/trellis_pccc_decoder_com%%QT_BINDIR%%ed_xx.xml +%%DATADIR%%/grc/blocks/trellis_pccc_decoder_combined_xx.xml %%DATADIR%%/grc/blocks/trellis_pccc_decoder_x.xml %%DATADIR%%/grc/blocks/trellis_pccc_encoder_xx.xml %%DATADIR%%/grc/blocks/trellis_permutation.xml -%%DATADIR%%/grc/blocks/trellis_sccc_decoder_com%%QT_BINDIR%%ed_xx.xml +%%DATADIR%%/grc/blocks/trellis_sccc_decoder_combined_xx.xml %%DATADIR%%/grc/blocks/trellis_sccc_decoder_x.xml %%DATADIR%%/grc/blocks/trellis_sccc_encoder_xx.xml -%%DATADIR%%/grc/blocks/trellis_siso_com%%QT_BINDIR%%ed_f.xml +%%DATADIR%%/grc/blocks/trellis_siso_combined_f.xml %%DATADIR%%/grc/blocks/trellis_siso_f.xml -%%DATADIR%%/grc/blocks/trellis_viterbi_com%%QT_BINDIR%%ed_xx.xml +%%DATADIR%%/grc/blocks/trellis_viterbi_combined_xx.xml %%DATADIR%%/grc/blocks/trellis_viterbi_x.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 @@ -2817,13 +2891,24 @@ libexec/gnuradio/grc_setup_freedesktop %%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_ldpc_G_matrix_object.xml +%%DATADIR%%/grc/blocks/variable_ldpc_H_matrix_object.xml +%%DATADIR%%/grc/blocks/variable_ldpc_bit_flip_decoder.xml +%%DATADIR%%/grc/blocks/variable_ldpc_encoder_G.xml +%%DATADIR%%/grc/blocks/variable_ldpc_encoder_H.xml %%DATADIR%%/grc/blocks/variable_low_pass_filter_taps.xml +%%DATADIR%%/grc/blocks/variable_polar_code_configurator.xml +%%DATADIR%%/grc/blocks/variable_polar_decoder_sc.xml +%%DATADIR%%/grc/blocks/variable_polar_decoder_sc_list.xml +%%DATADIR%%/grc/blocks/variable_polar_decoder_sc_systematic.xml +%%DATADIR%%/grc/blocks/variable_polar_encoder.xml +%%DATADIR%%/grc/blocks/variable_polar_encoder_systematic.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_struct.xml %%DATADIR%%/grc/blocks/variable_text_box.xml %%DATADIR%%/grc/blocks/video_block_tree.xml %%DATADIR%%/grc/blocks/video_sdl_sink.xml @@ -2859,8 +2944,8 @@ 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-16.png %%DATADIR%%/grc/freedesktop/grc-icon-24.png %%DATADIR%%/grc/freedesktop/grc-icon-256.png %%DATADIR%%/grc/freedesktop/grc-icon-32.png @@ -2913,5 +2998,50 @@ libexec/gnuradio/grc_setup_freedesktop %%DATADIR%%/modtool/gr-newmod/swig/howto_swig.i %%DATADIR%%/themes/alt.qss %%DATADIR%%/themes/dark.qss +%%DATADIR%%/themes/plain.qss +%%DATADIR%%/themes/projector.qss +%%UHD%%%%DATADIR%%/examples/hf_explorer/README +%%UHD%%%%DATADIR%%/examples/hf_explorer/hfx.py +%%UHD%%%%DATADIR%%/examples/hf_explorer/hfx_help +%%UHD%%%%DATADIR%%/examples/hf_radio/README.TXT +%%UHD%%%%DATADIR%%/examples/hf_radio/hfir.sci +%%UHD%%%%DATADIR%%/examples/hf_radio/input.py +%%UHD%%%%DATADIR%%/examples/hf_radio/output.py +%%UHD%%%%DATADIR%%/examples/hf_radio/radio.py +%%UHD%%%%DATADIR%%/examples/hf_radio/radio.xml +%%UHD%%%%DATADIR%%/examples/hf_radio/ssb_taps +%%UHD%%%%DATADIR%%/examples/hf_radio/ssbagc.py +%%UHD%%%%DATADIR%%/examples/hf_radio/ssbdemod.py +%%UHD%%%%DATADIR%%/examples/hf_radio/startup.py +%%UHD%%%%DATADIR%%/examples/hf_radio/ui.py +%%UHD%%%%DATADIR%%/examples/uhd/fm_tx4.py +%%UHD%%%%DATADIR%%/examples/uhd/fm_tx_2_daughterboards.py +%%UHD%%%%DATADIR%%/examples/uhd/max_power.py +%%UHD%%%%DATADIR%%/examples/uhd/tags_demo +%%UHD%%%%DATADIR%%/examples/uhd/uhd_const_wave.grc +%%UHD%%%%DATADIR%%/examples/uhd/uhd_dpsk_mod.grc +%%UHD%%%%DATADIR%%/examples/uhd/uhd_fft.grc +%%UHD%%%%DATADIR%%/examples/uhd/uhd_rx_dpsk.grc +%%UHD%%%%DATADIR%%/examples/uhd/uhd_two_tone_loopback.grc +%%UHD%%%%DATADIR%%/examples/uhd/uhd_tx_dpsk.grc +%%UHD%%%%DATADIR%%/examples/uhd/uhd_wbfm_receive.grc +%%UHD%%%%DATADIR%%/examples/uhd/usrp_am_mw_rcv.py +%%UHD%%%%DATADIR%%/examples/uhd/usrp_nbfm_ptt.py +%%UHD%%%%DATADIR%%/examples/uhd/usrp_nbfm_rcv.py +%%UHD%%%%DATADIR%%/examples/uhd/usrp_spectrum_sense.py +%%UHD%%%%DATADIR%%/examples/uhd/usrp_tv_rcv.py +%%UHD%%%%DATADIR%%/examples/uhd/usrp_tv_rcv_nogui.py +%%UHD%%%%DATADIR%%/examples/uhd/usrp_wfm_rcv.py +%%UHD%%%%DATADIR%%/examples/uhd/usrp_wfm_rcv2_nogui.py +%%UHD%%%%DATADIR%%/examples/uhd/usrp_wfm_rcv_fmdet.py +%%UHD%%%%DATADIR%%/examples/uhd/usrp_wfm_rcv_nogui.py +%%UHD%%%%DATADIR%%/examples/uhd/usrp_wfm_rcv_pll.py +%%UHD%%%%DATADIR%%/examples/uhd/usrp_wfm_rcv_sca.py +%%UHD%%%%DATADIR%%/examples/uhd/usrp_wxapt_rcv.py +%%UHD%%%%DATADIR%%/grc/blocks/uhd_amsg_source.xml +%%UHD%%%%DATADIR%%/grc/blocks/uhd_block_tree.xml +%%UHD%%%%DATADIR%%/grc/blocks/uhd_usrp_sink.xml +%%UHD%%%%DATADIR%%/grc/blocks/uhd_usrp_source.xml +%%UHD%%libdata/pkgconfig/gnuradio-uhd.pc @dir include/volk/asm/neon @dir include/volk/asm/orc -- cgit