svn commit: r392951 - in head/comms/gnuradio: . files

Diane Bruce db at FreeBSD.org
Sun Jul 26 23:00:31 UTC 2015 

Author: db
Date: Sun Jul 26 23:00:18 2015
New Revision: 392951
URL: https://svnweb.freebsd.org/changeset/ports/392951

Log:
  - Update to later version of gnuradio
  - fix build with portaudio
  - clang builtin's are conflicting with gnuradio so use USE_GCC for now

Added:
  head/comms/gnuradio/files/patch-volk_tmpl_volk__cpu.tmpl.c   (contents, props changed)
Modified:
  head/comms/gnuradio/Makefile
  head/comms/gnuradio/distinfo
  head/comms/gnuradio/files/patch-CMakeLists.txt
  head/comms/gnuradio/files/patch-cmake_Modules_FindUSB.cmake
  head/comms/gnuradio/files/patch-cmake_Modules_GrBoost.cmake
  head/comms/gnuradio/files/patch-cmake_Modules_GrMiscUtils.cmake
  head/comms/gnuradio/files/patch-docs_doxygen_Doxyfile.in
  head/comms/gnuradio/files/patch-gnuradio-runtime_CMakeLists.txt
  head/comms/gnuradio/files/patch-gnuradio-runtime_lib_thread_thread.cc
  head/comms/gnuradio/files/patch-gr-audio_doc_CMakeLists.txt
  head/comms/gnuradio/files/patch-gr-audio_lib_CMakeLists.txt
  head/comms/gnuradio/files/patch-gr-digital_doc_CMakeLists.txt
  head/comms/gnuradio/files/patch-gr-fcd_doc_CMakeLists.txt
  head/comms/gnuradio/files/patch-gr-fcd_lib_CMakeLists.txt
  head/comms/gnuradio/files/patch-gr-fcd_lib_hid_hid-libusb.c
  head/comms/gnuradio/files/patch-gr-fft_doc_CMakeLists.txt
  head/comms/gnuradio/files/patch-gr-filter_doc_CMakeLists.txt
  head/comms/gnuradio/files/patch-gr-qtgui_CMakeLists.txt
  head/comms/gnuradio/files/patch-gr-qtgui_doc_CMakeLists.txt
  head/comms/gnuradio/files/patch-gr-trellis_doc_CMakeLists.txt
  head/comms/gnuradio/files/patch-gr-uhd_CMakeLists.txt
  head/comms/gnuradio/files/patch-gr-uhd_doc_CMakeLists.txt
  head/comms/gnuradio/files/patch-gr-utils_python_modtool_CMakeLists.txt
  head/comms/gnuradio/files/patch-gr-vocoder_doc_CMakeLists.txt
  head/comms/gnuradio/files/patch-gr-wxgui_CMakeLists.txt
  head/comms/gnuradio/files/patch-grc_CMakeLists.txt
  head/comms/gnuradio/files/patch-grc_scripts_gnuradio-companion
  head/comms/gnuradio/files/patch-volk_CMakeLists.txt
  head/comms/gnuradio/pkg-plist

Modified: head/comms/gnuradio/Makefile
==============================================================================
--- head/comms/gnuradio/Makefile	Sun Jul 26 22:06:58 2015	(r392950)
+++ head/comms/gnuradio/Makefile	Sun Jul 26 23:00:18 2015	(r392951)
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	gnuradio
-PORTVERSION=	3.7.4
-PORTREVISION=	3
+PORTVERSION=	3.7.7.1
 CATEGORIES=	comms astro hamradio
 MASTER_SITES=	http://gnuradio.org/releases/gnuradio/ \
 		LOCAL/db
@@ -19,7 +18,6 @@ BUILD_DEPENDS=	sdl-config:${PORTSDIR}/de
 		${PYTHON_PKGNAMEPREFIX}qt4>0:${PORTSDIR}/devel/py-qt4 \
 		xdg-open:${PORTSDIR}/devel/xdg-utils \
 		guile:${PORTSDIR}/lang/guile \
-		icebox:${PORTSDIR}/devel/ice \
 		aconnect:${PORTSDIR}/audio/alsa-utils \
 		git:${PORTSDIR}/devel/git \
 		${PYNUMPY} \
@@ -35,25 +33,25 @@ LIB_DEPENDS=	libcppunit.so:${PORTSDIR}/d
 		libgsl.so:${PORTSDIR}/math/gsl
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-BROKEN_FreeBSD_9=	does not build on FreeBSD 9.x
-
-USES=		iconv cmake:outsource perl5 python:2.7 shebangfix
+USES=		cmake:outsource iconv perl5 python:2.7 shebangfix
 SHEBANG_FILES=	grc/freedesktop/grc_setup_freedesktop.in
-CMAKE_ENV+=	LD_PRELOAD="${GCC_LIBS}/libstdc++.so:${GCC_LIBS}/libgcc_s.so.1" 
+CMAKE_ENV+=	LD_PRELOAD="${GCC_LIBS}/libstdc++.so:${GCC_LIBS}/libgcc_s.so.1"
 CMAKE_ARGS+=	-DSWIG_EXECUTABLE:STRING="${LOCALBASE}/bin/swig2.0"
 CMAKE_ARGS+=	-DICONV_PREFIX:STRING="${ICONV_PREFIX}" \
 		-DICONV_LIB:STRING="X${ICONV_LIB}" \
-		-DICE_CONFIG_INCLUDE_DIR="${LOCALBASE}/include/"
-# for detailed debugging uncomment the next line
+		-DENABLE_GR_CTRLPORT="YES"
+# for detailed debugging uncomment the next two lines as needed
 #CMAKE_ARGS+=	--debug-output --trace
-DOCSDIR=	share/doc/${PORTNAME}-${PORTVERSION}
+MAJOR_SUB_VER=	3.7.7
+DOCSDIR=	share/doc/${PORTNAME}-${MAJOR_SUB_VER}
 USE_GNOME=	pygtk2
+USE_GCC=	yes
 USE_WX=		3.0+
 USE_QT4=	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"
-PORTDOCS=	*
+PLIST_SUB+=	MAJOR_SUB_VER="${MAJOR_SUB_VER}"
 
 OPTIONS_DEFINE=		USRP TESTING
 # Unfortunately building docs on i386 fails
@@ -70,15 +68,6 @@ GCC_LIBS=	${LOCALBASE}/lib/gcc${VP}
 
 .include <bsd.port.pre.mk>
 
-# Only use port clang34 on 10 if not RELEASE. I think this should do it.
-.if ${OSVERSION} <= 1000510 && ${OSVERSION} > 1000000
-# Debug hack
-#.if ${OSVERSION} <= 1200000
-BUILD_DEPENDS+=	clang34:${PORTSDIR}/lang/clang34
-CC=		clang34
-CXX=		clang++34
-.endif
-
 .if ${PORT_OPTIONS:MDOCS}
 BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen \
 		${LOCALBASE}/bin/sphinx-apidoc:${PORTSDIR}/textproc/py-sphinx \

Modified: head/comms/gnuradio/distinfo
==============================================================================
--- head/comms/gnuradio/distinfo	Sun Jul 26 22:06:58 2015	(r392950)
+++ head/comms/gnuradio/distinfo	Sun Jul 26 23:00:18 2015	(r392951)
@@ -1,2 +1,2 @@
-SHA256 (gnuradio-3.7.4.tar.gz) = 681da0e8694cc88be2dc168756418f21fef3666231d7b21bcfd6cbddd9a9406d
-SIZE (gnuradio-3.7.4.tar.gz) = 3461336
+SHA256 (gnuradio-3.7.7.1.tar.gz) = 2b27b13fc734ab5882e42c1661d433c0c097fd8b55b682f00626fa96c356584e
+SIZE (gnuradio-3.7.7.1.tar.gz) = 3845988

Modified: head/comms/gnuradio/files/patch-CMakeLists.txt
==============================================================================
--- head/comms/gnuradio/files/patch-CMakeLists.txt	Sun Jul 26 22:06:58 2015	(r392950)
+++ head/comms/gnuradio/files/patch-CMakeLists.txt	Sun Jul 26 23:00:18 2015	(r392951)
@@ -1,6 +1,18 @@
---- CMakeLists.txt.orig	2014-07-08 17:32:11.000000000 -0400
-+++ CMakeLists.txt	2014-07-29 18:41:58.000000000 -0400
-@@ -139,6 +139,14 @@
+--- CMakeLists.txt.orig	2015-05-12 09:39:44 UTC
++++ CMakeLists.txt
+@@ -29,6 +29,11 @@ cmake_minimum_required(VERSION 2.6)
+ project(gnuradio CXX C)
+ enable_testing()
+ 
++cmake_policy(SET CMP0026 OLD)
++cmake_policy(SET CMP0043 OLD)
++cmake_policy(SET CMP0045 OLD)
++cmake_policy(SET CMP0046 OLD)
++
+ #make sure our local CMake Modules path comes first
+ list(INSERT CMAKE_MODULE_PATH 0 ${CMAKE_SOURCE_DIR}/cmake/Modules)
+ 
+@@ -144,6 +149,14 @@ string(REPLACE "\n" " \\n" COMPILER_INFO
  ########################################################################
  include(GrPlatform) #define LIB_SUFFIX
  set(GR_RUNTIME_DIR      bin)
@@ -15,7 +27,7 @@
  set(GR_LIBRARY_DIR      lib${LIB_SUFFIX})
  set(GR_INCLUDE_DIR      include)
  set(GR_DATA_DIR         share)
-@@ -199,6 +207,42 @@
+@@ -228,6 +241,42 @@ add_custom_target(uninstall
  include(GrBoost)
  
  ########################################################################
@@ -58,7 +70,7 @@
  # Enable python component
  ########################################################################
  find_package(PythonLibs 2)
-@@ -283,11 +327,13 @@
+@@ -353,11 +402,13 @@ GR_LOGGING()
  ########################################################################
  # Distribute the README file
  ########################################################################

Modified: head/comms/gnuradio/files/patch-cmake_Modules_FindUSB.cmake
==============================================================================
--- head/comms/gnuradio/files/patch-cmake_Modules_FindUSB.cmake	Sun Jul 26 22:06:58 2015	(r392950)
+++ head/comms/gnuradio/files/patch-cmake_Modules_FindUSB.cmake	Sun Jul 26 23:00:18 2015	(r392951)
@@ -1,20 +1,22 @@
---- cmake/Modules/FindUSB.cmake.orig	2012-04-09 10:38:58.000000000 -0500
-+++ cmake/Modules/FindUSB.cmake	2014-03-02 20:19:39.000000000 -0500
-@@ -1,20 +1,38 @@
+--- cmake/Modules/FindUSB.cmake.orig	2015-05-12 09:39:44 UTC
++++ cmake/Modules/FindUSB.cmake
+@@ -1,20 +1,30 @@
  if(NOT LIBUSB_FOUND)
 -  pkg_check_modules (LIBUSB_PKG libusb-1.0)
 -  find_path(LIBUSB_INCLUDE_DIR NAMES libusb.h
-+    pkg_check_modules (LIBUSB_PKG libusb-1.0)
-+
-+    find_path(LIBUSB_INCLUDE_DIR NAMES libusb.h
-     PATHS
-     ${LIBUSB_PKG_INCLUDE_DIRS}
-     /usr/include/libusb-1.0
-     /usr/include
+-    PATHS
+-    ${LIBUSB_PKG_INCLUDE_DIRS}
+-    /usr/include/libusb-1.0
+-    /usr/include
 -    /usr/local/include
-   )
-+  message(status "--- LIBUSB_INCLUDE_DIR ${LIBUSB_INCLUDE_DIR}")
-+
+-  )
+-
+-  find_library(LIBUSB_LIBRARIES NAMES usb-1.0 usb
+-    PATHS
+-    ${LIBUSB_PKG_LIBRARY_DIRS}
+-    /usr/lib
+-    /usr/local/lib
+-  )
 +  if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
 +    message(status "--- Looking for FreeBSD usb")
 +    find_library(LIBUSB_LIBRARIES NAMES usb
@@ -22,25 +24,43 @@
 +      ${LIBUSB_PKG_LIBRARY_DIRS}
 +      /usr/lib
 +    )
-+
-+  message(status "--- LIBUSB_LIBRARIES ${LIBUSB_LIBRARIES}")
++  else()
++    message(status "--- LIBUSB_LIBRARIES ${LIBUSB_LIBRARIES}")
++    pkg_check_modules (LIBUSB_PKG libusb-1.0)
++    find_path(LIBUSB_INCLUDE_DIR NAMES libusb.h
++      PATHS
++      ${LIBUSB_PKG_INCLUDE_DIRS}
++      /usr/include/libusb-1.0
++      /usr/include
++      /usr/local/include
++    )
  
--  find_library(LIBUSB_LIBRARIES NAMES usb-1.0
-+    CHECK_LIBRARY_EXISTS(${LIBUSB_LIBRARIES} "libusb_get_string_descriptor"
-+	"/usr/lib" HAVE_LIBUSB_GET_STRING_DESCRIPTOR)
-+    if (HAVE_LIBUSB_GET_STRING_DESCRIPTOR)
-+      add_definitions( -DHAVE_LIBUSB_GET_STRING_DESCRIPTOR=${HAVE_LIBUSB_GET_STRING_DESCRIPTOR})
-+    endif()
-+    message(status "--- HAVE_LIBUSB_GET_STRING_DESCRIPTOR ${HAVE_LIBUSB_STRING_DESCRIPTOR}")
-+  endif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
-+
-+  find_library(LIBUSB_LIBRARIES NAMES usb
-     PATHS
-     ${LIBUSB_PKG_LIBRARY_DIRS}
-     /usr/lib
-     /usr/local/lib
-   )
--
++    find_library(LIBUSB_LIBRARIES NAMES usb-1.0 usb
++      PATHS
++      ${LIBUSB_PKG_LIBRARY_DIRS}
++      /usr/lib
++      /usr/local/lib
++    )
++  endif()
++  
  if(LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES)
    set(LIBUSB_FOUND TRUE CACHE INTERNAL "libusb-1.0 found")
    message(STATUS "Found libusb-1.0: ${LIBUSB_INCLUDE_DIR}, ${LIBUSB_LIBRARIES}")
+@@ -23,6 +33,17 @@ else(LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRA
+   message(STATUS "libusb-1.0 not found.")
+ endif(LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES)
+ 
++message(status "--- Checking for libusb_get_string_descriptor")
++set(CMAKE_REQUIRED_LIBRARIES ${LIBUSB_LIBRARIES})
++CHECK_FUNCTION_EXISTS(libusb_get_string_descriptor HAVE_LIBUSB_GET_STRING_DESCRIPTOR)
++
++if (HAVE_LIBUSB_GET_STRING_DESCRIPTOR)
++   add_definitions( -DHAVE_LIBUSB_GET_STRING_DESCRIPTOR)
++   message(status "--- Found libusb_get_string_descriptor")
++else()
++   message(status "--- libusb_get_string_descriptor Not Found")
++endif()
++
+ mark_as_advanced(LIBUSB_INCLUDE_DIR LIBUSB_LIBRARIES)
+ 
+ endif(NOT LIBUSB_FOUND)

Modified: head/comms/gnuradio/files/patch-cmake_Modules_GrBoost.cmake
==============================================================================
--- head/comms/gnuradio/files/patch-cmake_Modules_GrBoost.cmake	Sun Jul 26 22:06:58 2015	(r392950)
+++ head/comms/gnuradio/files/patch-cmake_Modules_GrBoost.cmake	Sun Jul 26 23:00:18 2015	(r392951)
@@ -1,6 +1,6 @@
---- cmake/Modules/GrBoost.cmake.orig	2014-03-06 20:24:23.000000000 -0500
-+++ cmake/Modules/GrBoost.cmake	2014-03-06 20:25:07.000000000 -0500
-@@ -53,6 +53,8 @@
+--- cmake/Modules/GrBoost.cmake.orig	2015-05-12 09:39:44 UTC
++++ cmake/Modules/GrBoost.cmake
+@@ -53,6 +53,8 @@ if(MSVC)
  endif(MSVC)
  
  find_package(Boost "1.35" COMPONENTS ${BOOST_REQUIRED_COMPONENTS})

Modified: head/comms/gnuradio/files/patch-cmake_Modules_GrMiscUtils.cmake
==============================================================================
--- head/comms/gnuradio/files/patch-cmake_Modules_GrMiscUtils.cmake	Sun Jul 26 22:06:58 2015	(r392950)
+++ head/comms/gnuradio/files/patch-cmake_Modules_GrMiscUtils.cmake	Sun Jul 26 23:00:18 2015	(r392951)
@@ -1,11 +1,11 @@
---- cmake/Modules/GrMiscUtils.cmake.orig	2014-07-07 17:29:01.000000000 -0400
-+++ cmake/Modules/GrMiscUtils.cmake	2014-07-29 18:42:23.000000000 -0400
-@@ -142,7 +142,31 @@
+--- cmake/Modules/GrMiscUtils.cmake.orig	2015-05-12 09:39:44 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
          RUNTIME DESTINATION ${GR_RUNTIME_DIR} COMPONENT ${GR_LIBRARY_RUNTIME_COMPONENT} # .dll file
      )
 +    
- 
++
 +    if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
 +        #create .la file
 +        GR_LIBTOOL(TARGET ${target} DESTINATION ${GR_LIBRARY_DIR})
@@ -20,7 +20,7 @@
 +            COMMAND ${CMAKE_COMMAND} -E create_symlink ${target_name} "${CMAKE_CURRENT_BINARY_DIR}/lib${target}.so.${MAJOR_VERSION}"
 +            COMMAND ${CMAKE_COMMAND} -E touch ${target_name} #so the symlinks point to something valid so cmake 2.6 will install
 +        )
-+
+ 
 +        #and install the extra symlinks
 +        install(
 +            FILES

Modified: head/comms/gnuradio/files/patch-docs_doxygen_Doxyfile.in
==============================================================================
--- head/comms/gnuradio/files/patch-docs_doxygen_Doxyfile.in	Sun Jul 26 22:06:58 2015	(r392950)
+++ head/comms/gnuradio/files/patch-docs_doxygen_Doxyfile.in	Sun Jul 26 23:00:18 2015	(r392951)
@@ -1,11 +1,11 @@
---- docs/doxygen/Doxyfile.in.orig	2014-03-31 11:52:54.000000000 -0400
-+++ docs/doxygen/Doxyfile.in	2014-07-29 18:42:29.000000000 -0400
-@@ -1839,7 +1839,7 @@
+--- docs/doxygen/Doxyfile.in.orig	2015-05-12 09:39:44 UTC
++++ docs/doxygen/Doxyfile.in
+@@ -1864,7 +1864,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           =	/usr/local/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

Modified: head/comms/gnuradio/files/patch-gnuradio-runtime_CMakeLists.txt
==============================================================================
--- head/comms/gnuradio/files/patch-gnuradio-runtime_CMakeLists.txt	Sun Jul 26 22:06:58 2015	(r392950)
+++ head/comms/gnuradio/files/patch-gnuradio-runtime_CMakeLists.txt	Sun Jul 26 23:00:18 2015	(r392951)
@@ -1,44 +1,6 @@
---- gnuradio-runtime/CMakeLists.txt.orig	2014-07-02 21:09:41.000000000 -0400
-+++ gnuradio-runtime/CMakeLists.txt	2014-07-29 18:42:32.000000000 -0400
-@@ -141,18 +141,37 @@
-     ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-runtime.conf
- @ONLY)
- 
-+if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
-+ install(
-+     FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-runtime.conf
-+     DESTINATION ${GR_PREFSDIR}
-+     RENAME "gnuradio-runtime.conf.sample"
-+     COMPONENT "runtime_runtime"
-+ )
-+else()
- install(
-     FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-runtime.conf
-     DESTINATION ${GR_PREFSDIR}
-     COMPONENT "runtime_runtime"
- )
-+endif()
- 
- if(ENABLE_GR_LOG AND HAVE_LOG4CPP)
-+if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
- install(FILES
-     ${CMAKE_CURRENT_SOURCE_DIR}/gr_log_default.conf
-     DESTINATION ${GR_CONF_DIR}/gnuradio
-+    RENAME "gr_log_default.conf.sample"
-     COMPONENT "runtime_runtime"
- )
-+else()
-+install(FILES
-+    ${CMAKE_CURRENT_SOURCE_DIR}/gr_log_default.conf
-+    DESTINATION ${GR_CONF_DIR}/gnuradio
-+    COMPONENT "runtime_runtime"
-+)
-+endif()
-+
- endif(ENABLE_GR_LOG AND HAVE_LOG4CPP)
- 
- ########################################################################
-@@ -179,7 +198,7 @@
+--- 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

Modified: head/comms/gnuradio/files/patch-gnuradio-runtime_lib_thread_thread.cc
==============================================================================
--- head/comms/gnuradio/files/patch-gnuradio-runtime_lib_thread_thread.cc	Sun Jul 26 22:06:58 2015	(r392950)
+++ head/comms/gnuradio/files/patch-gnuradio-runtime_lib_thread_thread.cc	Sun Jul 26 23:00:18 2015	(r392951)
@@ -1,6 +1,6 @@
---- gnuradio-runtime/lib/thread/thread.cc.orig	2014-07-08 16:55:12.000000000 -0400
-+++ gnuradio-runtime/lib/thread/thread.cc	2014-07-29 18:42:37.000000000 -0400
-@@ -276,6 +276,7 @@
+--- gnuradio-runtime/lib/thread/thread.cc.orig	2015-05-12 09:39:44 UTC
++++ gnuradio-runtime/lib/thread/thread.cc
+@@ -276,6 +276,7 @@ namespace gr {
      void
      thread_bind_to_processor(gr_thread_t thread, const std::vector<int> &mask)
      {
@@ -8,7 +8,7 @@
        cpu_set_t set;
        size_t len = sizeof(cpu_set_t);
        std::vector<int> _mask = mask;
-@@ -291,6 +292,7 @@
+@@ -291,6 +292,7 @@ namespace gr {
          s << "thread_bind_to_processor failed with error: " << ret << std::endl;
          throw std::runtime_error(s.str());
        }
@@ -16,7 +16,7 @@
      }
  
      void
-@@ -302,6 +304,7 @@
+@@ -302,6 +304,7 @@ namespace gr {
      void
      thread_unbind(gr_thread_t thread)
      {
@@ -24,7 +24,7 @@
        cpu_set_t set;
        size_t len = sizeof(cpu_set_t);
  
-@@ -317,6 +320,7 @@
+@@ -317,6 +320,7 @@ namespace gr {
          s << "thread_unbind failed with error: " << ret << std::endl;
          throw std::runtime_error(s.str());
        }

Modified: head/comms/gnuradio/files/patch-gr-audio_doc_CMakeLists.txt
==============================================================================
--- head/comms/gnuradio/files/patch-gr-audio_doc_CMakeLists.txt	Sun Jul 26 22:06:58 2015	(r392950)
+++ head/comms/gnuradio/files/patch-gr-audio_doc_CMakeLists.txt	Sun Jul 26 23:00:18 2015	(r392951)
@@ -1,5 +1,5 @@
---- gr-audio/doc/CMakeLists.txt.orig	2012-04-21 15:12:41.000000000 -0500
-+++ gr-audio/doc/CMakeLists.txt	2014-03-02 20:20:02.000000000 -0500
+--- gr-audio/doc/CMakeLists.txt.orig	2015-05-12 09:39:44 UTC
++++ gr-audio/doc/CMakeLists.txt
 @@ -17,7 +17,9 @@
  # the Free Software Foundation, Inc., 51 Franklin Street,
  # Boston, MA 02110-1301, USA.

Modified: head/comms/gnuradio/files/patch-gr-audio_lib_CMakeLists.txt
==============================================================================
--- head/comms/gnuradio/files/patch-gr-audio_lib_CMakeLists.txt	Sun Jul 26 22:06:58 2015	(r392950)
+++ head/comms/gnuradio/files/patch-gr-audio_lib_CMakeLists.txt	Sun Jul 26 23:00:18 2015	(r392951)
@@ -1,6 +1,6 @@
---- gr-audio/lib/CMakeLists.txt.orig	2014-07-02 21:09:41.000000000 -0400
-+++ gr-audio/lib/CMakeLists.txt	2014-08-02 14:55:41.000000000 -0400
-@@ -184,7 +184,15 @@
+--- 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")
  
@@ -16,4 +16,4 @@
 +endif()
  
  if(ENABLE_STATIC_LIBS)
-   add_library(gnuradio-audio_static STATIC ${gr_audio_sources})
+   if(ENABLE_GR_CTRLPORT)

Modified: head/comms/gnuradio/files/patch-gr-digital_doc_CMakeLists.txt
==============================================================================
--- head/comms/gnuradio/files/patch-gr-digital_doc_CMakeLists.txt	Sun Jul 26 22:06:58 2015	(r392950)
+++ head/comms/gnuradio/files/patch-gr-digital_doc_CMakeLists.txt	Sun Jul 26 23:00:18 2015	(r392951)
@@ -1,5 +1,5 @@
---- gr-digital/doc/CMakeLists.txt.orig	2012-01-02 14:04:33.000000000 -0500
-+++ gr-digital/doc/CMakeLists.txt	2014-03-02 20:20:09.000000000 -0500
+--- gr-digital/doc/CMakeLists.txt.orig	2015-05-12 09:39:44 UTC
++++ gr-digital/doc/CMakeLists.txt
 @@ -17,7 +17,9 @@
  # the Free Software Foundation, Inc., 51 Franklin Street,
  # Boston, MA 02110-1301, USA.

Modified: head/comms/gnuradio/files/patch-gr-fcd_doc_CMakeLists.txt
==============================================================================
--- head/comms/gnuradio/files/patch-gr-fcd_doc_CMakeLists.txt	Sun Jul 26 22:06:58 2015	(r392950)
+++ head/comms/gnuradio/files/patch-gr-fcd_doc_CMakeLists.txt	Sun Jul 26 23:00:18 2015	(r392951)
@@ -1,5 +1,5 @@
---- gr-fcd/doc/CMakeLists.txt.orig	2012-04-21 15:12:41.000000000 -0500
-+++ gr-fcd/doc/CMakeLists.txt	2014-03-02 20:20:13.000000000 -0500
+--- gr-fcd/doc/CMakeLists.txt.orig	2015-05-12 09:39:44 UTC
++++ gr-fcd/doc/CMakeLists.txt
 @@ -17,7 +17,9 @@
  # the Free Software Foundation, Inc., 51 Franklin Street,
  # Boston, MA 02110-1301, USA.

Modified: head/comms/gnuradio/files/patch-gr-fcd_lib_CMakeLists.txt
==============================================================================
--- head/comms/gnuradio/files/patch-gr-fcd_lib_CMakeLists.txt	Sun Jul 26 22:06:58 2015	(r392950)
+++ head/comms/gnuradio/files/patch-gr-fcd_lib_CMakeLists.txt	Sun Jul 26 23:00:18 2015	(r392951)
@@ -1,6 +1,6 @@
---- gr-fcd/lib/CMakeLists.txt.orig	2013-08-28 13:27:03.000000000 -0500
-+++ gr-fcd/lib/CMakeLists.txt	2014-03-02 20:20:16.000000000 -0500
-@@ -32,6 +32,7 @@
+--- gr-fcd/lib/CMakeLists.txt.orig	2015-05-12 09:39:44 UTC
++++ gr-fcd/lib/CMakeLists.txt
+@@ -32,6 +32,7 @@ include_directories(
      ${GNURADIO_RUNTIME_INCLUDE_DIRS}
      ${Boost_INCLUDE_DIRS}
      ${LIBUSB_INCLUDE_DIR}
@@ -8,7 +8,7 @@
  )
  
  link_directories(
-@@ -91,6 +92,10 @@
+@@ -90,6 +91,10 @@ add_library(gnuradio-fcd SHARED ${gr_fcd
  if (LINUX)
    list(APPEND fcd_libs rt)
  endif()

Modified: head/comms/gnuradio/files/patch-gr-fcd_lib_hid_hid-libusb.c
==============================================================================
--- head/comms/gnuradio/files/patch-gr-fcd_lib_hid_hid-libusb.c	Sun Jul 26 22:06:58 2015	(r392950)
+++ head/comms/gnuradio/files/patch-gr-fcd_lib_hid_hid-libusb.c	Sun Jul 26 23:00:18 2015	(r392951)
@@ -1,15 +1,17 @@
---- gr-fcd/lib/hid/hid-libusb.c.orig	2013-08-28 13:27:03.000000000 -0500
-+++ gr-fcd/lib/hid/hid-libusb.c	2014-03-02 20:20:18.000000000 -0500
-@@ -250,7 +250,7 @@
+--- gr-fcd/lib/hid/hid-libusb.c.orig	2015-05-12 09:39:44 UTC
++++ gr-fcd/lib/hid/hid-libusb.c
+@@ -250,8 +250,8 @@ static int get_usage(uint8_t *report_des
  }
  #endif /* INVASIVE_GET_USAGE */
  
 -#ifdef __FreeBSD__
+-/* The FreeBSD version of libusb doesn't have this funciton. In mainline
 +#ifndef HAVE_LIBUSB_GET_STRING_DESCRIPTOR
- /* The FreeBSD version of libusb doesn't have this funciton. In mainline
++/* The FreeBSD version of libusb doesn't have this function. In mainline
     libusb, it's inlined in libusb.h. This function will bear a striking
     resemblence to that one, because there's about one way to code it.
-@@ -756,8 +756,12 @@
+ 
+@@ -756,8 +756,12 @@ static void *read_thread(void *param)
  	   if no transfers are pending, but that's OK. */
  	libusb_cancel_transfer(dev->transfer);
  

Modified: head/comms/gnuradio/files/patch-gr-fft_doc_CMakeLists.txt
==============================================================================
--- head/comms/gnuradio/files/patch-gr-fft_doc_CMakeLists.txt	Sun Jul 26 22:06:58 2015	(r392950)
+++ head/comms/gnuradio/files/patch-gr-fft_doc_CMakeLists.txt	Sun Jul 26 23:00:18 2015	(r392951)
@@ -1,5 +1,5 @@
---- gr-fft/doc/CMakeLists.txt.orig	2012-06-11 10:41:27.000000000 -0500
-+++ gr-fft/doc/CMakeLists.txt	2014-03-02 20:20:21.000000000 -0500
+--- 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.

Modified: head/comms/gnuradio/files/patch-gr-filter_doc_CMakeLists.txt
==============================================================================
--- head/comms/gnuradio/files/patch-gr-filter_doc_CMakeLists.txt	Sun Jul 26 22:06:58 2015	(r392950)
+++ head/comms/gnuradio/files/patch-gr-filter_doc_CMakeLists.txt	Sun Jul 26 23:00:18 2015	(r392951)
@@ -1,5 +1,5 @@
---- gr-filter/doc/CMakeLists.txt.orig	2012-09-04 21:08:20.000000000 -0500
-+++ gr-filter/doc/CMakeLists.txt	2014-03-02 20:20:23.000000000 -0500
+--- 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.

Modified: head/comms/gnuradio/files/patch-gr-qtgui_CMakeLists.txt
==============================================================================
--- head/comms/gnuradio/files/patch-gr-qtgui_CMakeLists.txt	Sun Jul 26 22:06:58 2015	(r392950)
+++ head/comms/gnuradio/files/patch-gr-qtgui_CMakeLists.txt	Sun Jul 26 23:00:18 2015	(r392951)
@@ -1,6 +1,6 @@
---- gr-qtgui/CMakeLists.txt.orig	2014-08-02 15:09:03.000000000 -0400
-+++ gr-qtgui/CMakeLists.txt	2014-08-02 15:11:16.000000000 -0400
-@@ -128,17 +128,26 @@
+--- 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
@@ -27,4 +27,5 @@
  )
 +endif()
  
- endif(ENABLE_GR_QTGUI)
+ 
+ ########################################################################

Modified: head/comms/gnuradio/files/patch-gr-qtgui_doc_CMakeLists.txt
==============================================================================
--- head/comms/gnuradio/files/patch-gr-qtgui_doc_CMakeLists.txt	Sun Jul 26 22:06:58 2015	(r392950)
+++ head/comms/gnuradio/files/patch-gr-qtgui_doc_CMakeLists.txt	Sun Jul 26 23:00:18 2015	(r392951)
@@ -1,5 +1,5 @@
---- gr-qtgui/doc/CMakeLists.txt.orig	2012-04-21 15:12:41.000000000 -0500
-+++ gr-qtgui/doc/CMakeLists.txt	2014-03-02 20:20:26.000000000 -0500
+--- 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.

Modified: head/comms/gnuradio/files/patch-gr-trellis_doc_CMakeLists.txt
==============================================================================
--- head/comms/gnuradio/files/patch-gr-trellis_doc_CMakeLists.txt	Sun Jul 26 22:06:58 2015	(r392950)
+++ head/comms/gnuradio/files/patch-gr-trellis_doc_CMakeLists.txt	Sun Jul 26 23:00:18 2015	(r392951)
@@ -1,6 +1,6 @@
---- gr-trellis/doc/CMakeLists.txt.orig	2012-04-21 15:12:41.000000000 -0500
-+++ gr-trellis/doc/CMakeLists.txt	2014-03-02 20:20:28.000000000 -0500
-@@ -32,12 +32,14 @@
+--- 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)
@@ -15,7 +15,7 @@
  endif(XMLTO_EXECUTABLE)
  
  ########################################################################
-@@ -65,9 +67,11 @@
+@@ -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
  )

Modified: head/comms/gnuradio/files/patch-gr-uhd_CMakeLists.txt
==============================================================================
--- head/comms/gnuradio/files/patch-gr-uhd_CMakeLists.txt	Sun Jul 26 22:06:58 2015	(r392950)
+++ head/comms/gnuradio/files/patch-gr-uhd_CMakeLists.txt	Sun Jul 26 23:00:18 2015	(r392951)
@@ -1,6 +1,6 @@
---- gr-uhd/CMakeLists.txt.orig	2013-08-28 13:27:03.000000000 -0500
-+++ gr-uhd/CMakeLists.txt	2014-03-02 20:20:30.000000000 -0500
-@@ -115,7 +115,7 @@
+--- 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

Modified: head/comms/gnuradio/files/patch-gr-uhd_doc_CMakeLists.txt
==============================================================================
--- head/comms/gnuradio/files/patch-gr-uhd_doc_CMakeLists.txt	Sun Jul 26 22:06:58 2015	(r392950)
+++ head/comms/gnuradio/files/patch-gr-uhd_doc_CMakeLists.txt	Sun Jul 26 23:00:18 2015	(r392951)
@@ -1,5 +1,5 @@
---- gr-uhd/doc/CMakeLists.txt.orig	2012-04-21 15:12:41.000000000 -0500
-+++ gr-uhd/doc/CMakeLists.txt	2014-03-02 20:20:31.000000000 -0500
+--- 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.

Modified: head/comms/gnuradio/files/patch-gr-utils_python_modtool_CMakeLists.txt
==============================================================================
--- head/comms/gnuradio/files/patch-gr-utils_python_modtool_CMakeLists.txt	Sun Jul 26 22:06:58 2015	(r392950)
+++ head/comms/gnuradio/files/patch-gr-utils_python_modtool_CMakeLists.txt	Sun Jul 26 23:00:18 2015	(r392951)
@@ -1,6 +1,6 @@
---- gr-utils/python/modtool/CMakeLists.txt.orig	2014-02-22 12:29:47.000000000 -0500
-+++ gr-utils/python/modtool/CMakeLists.txt	2014-07-29 18:43:53.000000000 -0400
-@@ -57,9 +57,17 @@
+--- 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)
  

Modified: head/comms/gnuradio/files/patch-gr-vocoder_doc_CMakeLists.txt
==============================================================================
--- head/comms/gnuradio/files/patch-gr-vocoder_doc_CMakeLists.txt	Sun Jul 26 22:06:58 2015	(r392950)
+++ head/comms/gnuradio/files/patch-gr-vocoder_doc_CMakeLists.txt	Sun Jul 26 23:00:18 2015	(r392951)
@@ -1,5 +1,5 @@
---- gr-vocoder/doc/CMakeLists.txt.orig	2012-04-21 15:12:41.000000000 -0500
-+++ gr-vocoder/doc/CMakeLists.txt	2014-03-02 20:20:35.000000000 -0500
+--- 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.

Modified: head/comms/gnuradio/files/patch-gr-wxgui_CMakeLists.txt
==============================================================================
--- head/comms/gnuradio/files/patch-gr-wxgui_CMakeLists.txt	Sun Jul 26 22:06:58 2015	(r392950)
+++ head/comms/gnuradio/files/patch-gr-wxgui_CMakeLists.txt	Sun Jul 26 23:00:18 2015	(r392951)
@@ -1,6 +1,14 @@
---- gr-wxgui/CMakeLists.txt.orig	2013-11-04 13:50:36.000000000 -0500
-+++ gr-wxgui/CMakeLists.txt	2014-03-02 20:20:37.000000000 -0500
-@@ -106,12 +106,21 @@
+--- 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
  ########################################################################

Modified: head/comms/gnuradio/files/patch-grc_CMakeLists.txt
==============================================================================
--- head/comms/gnuradio/files/patch-grc_CMakeLists.txt	Sun Jul 26 22:06:58 2015	(r392950)
+++ head/comms/gnuradio/files/patch-grc_CMakeLists.txt	Sun Jul 26 23:00:18 2015	(r392951)
@@ -1,6 +1,6 @@
---- grc/CMakeLists.txt.orig	2014-08-02 15:03:57.000000000 -0400
-+++ grc/CMakeLists.txt	2014-08-02 15:03:59.000000000 -0400
-@@ -73,11 +73,21 @@
+--- 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)
  

Modified: head/comms/gnuradio/files/patch-grc_scripts_gnuradio-companion
==============================================================================
--- head/comms/gnuradio/files/patch-grc_scripts_gnuradio-companion	Sun Jul 26 22:06:58 2015	(r392950)
+++ head/comms/gnuradio/files/patch-grc_scripts_gnuradio-companion	Sun Jul 26 23:00:18 2015	(r392951)
@@ -1,8 +1,8 @@
---- grc/scripts/gnuradio-companion.orig	2014-03-27 14:30:40.047953899 -0400
-+++ grc/scripts/gnuradio-companion	2014-03-27 14:31:24.523952302 -0400
-@@ -18,6 +18,10 @@
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
- """
+--- grc/scripts/gnuradio-companion.orig	2015-05-12 09:39:44 UTC
++++ grc/scripts/gnuradio-companion
+@@ -22,6 +22,10 @@ import os
+ import sys
+ import optparse
  
 +# XXX workaround to make sure we import gcc47's libgcc_s.so not
 +# the older one from base:

Modified: head/comms/gnuradio/files/patch-volk_CMakeLists.txt
==============================================================================
--- head/comms/gnuradio/files/patch-volk_CMakeLists.txt	Sun Jul 26 22:06:58 2015	(r392950)
+++ head/comms/gnuradio/files/patch-volk_CMakeLists.txt	Sun Jul 26 23:00:18 2015	(r392951)
@@ -1,6 +1,6 @@
---- volk/CMakeLists.txt.orig	2014-07-07 17:29:01.000000000 -0400
-+++ volk/CMakeLists.txt	2014-07-29 18:44:30.000000000 -0400
-@@ -102,7 +102,7 @@
+--- volk/CMakeLists.txt.orig	2015-05-12 09:39:44 UTC
++++ volk/CMakeLists.txt
+@@ -136,7 +136,7 @@ configure_file(
  
  install(
      FILES ${CMAKE_CURRENT_BINARY_DIR}/volk.pc

Added: head/comms/gnuradio/files/patch-volk_tmpl_volk__cpu.tmpl.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/gnuradio/files/patch-volk_tmpl_volk__cpu.tmpl.c	Sun Jul 26 23:00:18 2015	(r392951)
@@ -0,0 +1,35 @@
+--- volk/tmpl/volk_cpu.tmpl.c.orig	2015-05-12 09:39:44 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"
++	#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)
+ 

Modified: head/comms/gnuradio/pkg-plist
==============================================================================
--- head/comms/gnuradio/pkg-plist	Sun Jul 26 22:06:58 2015	(r392950)
+++ head/comms/gnuradio/pkg-plist	Sun Jul 26 23:00:18 2015	(r392951)
@@ -1,1669 +1,67 @@
-%%DATADIR%%/examples/analog/fmtest.py
-%%DATADIR%%/examples/atsc/README
-%%DATADIR%%/examples/atsc/atsc_rx.py
-%%DATADIR%%/examples/audio/audio_copy.py
-%%DATADIR%%/examples/audio/audio_fft.py
-%%DATADIR%%/examples/audio/audio_play.py
-%%DATADIR%%/examples/audio/audio_to_file.py
-%%DATADIR%%/examples/audio/cvsd_sweep.grc
-%%DATADIR%%/examples/audio/dial_tone
-%%DATADIR%%/examples/audio/dial_tone.grc
-%%DATADIR%%/examples/audio/dial_tone.py
-%%DATADIR%%/examples/audio/dial_tone_daemon.py
-%%DATADIR%%/examples/audio/dial_tone_wav.py
-%%DATADIR%%/examples/audio/mono_tone.py
-%%DATADIR%%/examples/audio/multi_tone.py
-%%DATADIR%%/examples/audio/noise.py
-%%DATADIR%%/examples/audio/spectrum_inversion.py
-%%DATADIR%%/examples/audio/test_resampler.py
-%%DATADIR%%/examples/channels/channel_tone_response.grc
-%%DATADIR%%/examples/channels/demo_gmsk.grc
-%%DATADIR%%/examples/channels/demo_ofdm.grc
-%%DATADIR%%/examples/channels/demo_qam.grc
-%%DATADIR%%/examples/channels/demo_quantization.grc
-%%DATADIR%%/examples/channels/demo_spec_an.grc
-%%DATADIR%%/examples/channels/demo_two_tone.grc
-%%DATADIR%%/examples/digital/demod/ber_simulation.grc
-%%DATADIR%%/examples/digital/demod/digital_freq_lock.grc
-%%DATADIR%%/examples/digital/demod/dpsk_loopback.grc
-%%DATADIR%%/examples/digital/demod/gfsk_loopback.grc
-%%DATADIR%%/examples/digital/demod/mpsk_demod.grc
-%%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/uhd_corr_and_sync_rx.grc
-%%DATADIR%%/examples/digital/example_costas.py
-%%DATADIR%%/examples/digital/example_fll.py
-%%DATADIR%%/examples/digital/example_timing.py
-%%DATADIR%%/examples/digital/gen_whitener.py
-%%DATADIR%%/examples/digital/narrowband/benchmark_rx.py
-%%DATADIR%%/examples/digital/narrowband/benchmark_tx.py
-%%DATADIR%%/examples/digital/narrowband/digital_bert_rx.py
-%%DATADIR%%/examples/digital/narrowband/digital_bert_tx.py
-%%DATADIR%%/examples/digital/narrowband/receive_path.py
-%%DATADIR%%/examples/digital/narrowband/rx_voice.py
-%%DATADIR%%/examples/digital/narrowband/transmit_path.py
-%%DATADIR%%/examples/digital/narrowband/tunnel.py
-%%DATADIR%%/examples/digital/narrowband/tx_voice.py
-%%DATADIR%%/examples/digital/ofdm/benchmark_add_channel.py
-%%DATADIR%%/examples/digital/ofdm/benchmark_rx.py
-%%DATADIR%%/examples/digital/ofdm/benchmark_tx.py
-%%DATADIR%%/examples/digital/ofdm/gr_plot_ofdm.py
-%%DATADIR%%/examples/digital/ofdm/ofdm_loopback.grc
-%%DATADIR%%/examples/digital/ofdm/receive_path.py
-%%DATADIR%%/examples/digital/ofdm/rx_ofdm.grc
-%%DATADIR%%/examples/digital/ofdm/transmit_path.py
-%%DATADIR%%/examples/digital/ofdm/tunnel.py
-%%DATADIR%%/examples/digital/ofdm/tx_ofdm.grc
-%%DATADIR%%/examples/digital/run_length.py
-%%DATADIR%%/examples/digital/snr_estimators.py
-%%DATADIR%%/examples/fcd/fcd_apt_rx.grc
-%%DATADIR%%/examples/fcd/fcd_fft_wx.grc
-%%DATADIR%%/examples/fcd/fcd_nfm_rx
-%%DATADIR%%/examples/fcd/fcd_nfm_rx.grc
-%%DATADIR%%/examples/fec/ber_curve_gen.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_decoders.grc
-%%DATADIR%%/examples/fec/fecapi_encoders.grc
-%%DATADIR%%/examples/fec/fecapi_tagged_decoders.grc
-%%DATADIR%%/examples/fec/fecapi_tagged_encoders.grc
-%%DATADIR%%/examples/filter/channelize.py
-%%DATADIR%%/examples/filter/chirp_channelize.py
-%%DATADIR%%/examples/filter/decimate.py
-%%DATADIR%%/examples/filter/fft_filter_ccc.py
-%%DATADIR%%/examples/filter/fir_filter_ccc.py
-%%DATADIR%%/examples/filter/fir_filter_fff.py
-%%DATADIR%%/examples/filter/gr_filtdes_api.py
-%%DATADIR%%/examples/filter/gr_filtdes_callback.py
-%%DATADIR%%/examples/filter/gr_filtdes_live_upd.py
-%%DATADIR%%/examples/filter/gr_filtdes_restrict.py
-%%DATADIR%%/examples/filter/interpolate.py
-%%DATADIR%%/examples/filter/reconstruction.py
-%%DATADIR%%/examples/filter/resampler.py
-%%DATADIR%%/examples/filter/resampler_demo.grc
-%%DATADIR%%/examples/filter/synth_filter.py
-%%DATADIR%%/examples/filter/synth_to_chan.py
-%%DATADIR%%/examples/grc/simple/variable_config.grc
-%%DATADIR%%/examples/grc/xmlrpc/readme.txt
-%%DATADIR%%/examples/grc/xmlrpc/xmlrpc_client.grc
-%%DATADIR%%/examples/grc/xmlrpc/xmlrpc_client_script.py
-%%DATADIR%%/examples/grc/xmlrpc/xmlrpc_server.grc
-%%DATADIR%%/examples/metadata/file_metadata_sink.grc
-%%DATADIR%%/examples/metadata/file_metadata_source.grc
-%%DATADIR%%/examples/metadata/file_metadata_vector_sink.grc
-%%DATADIR%%/examples/metadata/file_metadata_vector_source.grc
-%%DATADIR%%/examples/mp-sched/README
-%%DATADIR%%/examples/mp-sched/affinity_set.py
-%%DATADIR%%/examples/mp-sched/plot_flops.py
-%%DATADIR%%/examples/mp-sched/run_synthetic.py
-%%DATADIR%%/examples/mp-sched/synthetic.py
-%%DATADIR%%/examples/mp-sched/wfm_rcv_pll_to_wav.py
-%%DATADIR%%/examples/network/audio_sink.py
-%%DATADIR%%/examples/network/audio_source.py
-%%DATADIR%%/examples/network/dial_tone_sink.py
-%%DATADIR%%/examples/network/dial_tone_source.py
-%%DATADIR%%/examples/network/vector_sink.py
-%%DATADIR%%/examples/network/vector_source.py
-%%DATADIR%%/examples/noaa/file_rx_hrpt.grc
-%%DATADIR%%/examples/noaa/hrpt_decode.grc
-%%DATADIR%%/examples/noaa/hrpt_demod.grc
-%%DATADIR%%/examples/noaa/usrp_rx_hrpt.grc
-%%DATADIR%%/examples/noaa/usrp_rx_hrpt_nogui.grc
-%%DATADIR%%/examples/qt-gui/alt.qss
-%%DATADIR%%/examples/qt-gui/dark.qss
-%%DATADIR%%/examples/qt-gui/pyqt_const_c.py
-%%DATADIR%%/examples/qt-gui/pyqt_example_c.py
-%%DATADIR%%/examples/qt-gui/pyqt_example_f.py
-%%DATADIR%%/examples/qt-gui/pyqt_freq_c.py
-%%DATADIR%%/examples/qt-gui/pyqt_freq_f.py
-%%DATADIR%%/examples/qt-gui/pyqt_histogram_f.py
-%%DATADIR%%/examples/qt-gui/pyqt_time_c.py
-%%DATADIR%%/examples/qt-gui/pyqt_time_f.py
-%%DATADIR%%/examples/qt-gui/pyqt_time_raster_b.py
-%%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_tags_viewing.grc
-%%DATADIR%%/examples/tags/test_file_tags.py
-%%DATADIR%%/examples/trellis/README
-%%DATADIR%%/examples/trellis/fsm_files/awgn1o2_128.fsm
-%%DATADIR%%/examples/trellis/fsm_files/awgn1o2_16.fsm
-%%DATADIR%%/examples/trellis/fsm_files/awgn1o2_4.fsm
-%%DATADIR%%/examples/trellis/fsm_files/awgn1o2_8.fsm
-%%DATADIR%%/examples/trellis/fsm_files/awgn2o3_16.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_8.fsm
-%%DATADIR%%/examples/trellis/fsm_files/awgn2o4_4.fsm
-%%DATADIR%%/examples/trellis/fsm_files/disconnected.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_utils.py
-%%DATADIR%%/examples/trellis/interference_cancellation.grc
-%%DATADIR%%/examples/trellis/pccc.grc
-%%DATADIR%%/examples/trellis/pccc1.grc
-%%DATADIR%%/examples/trellis/readme.txt
-%%DATADIR%%/examples/trellis/sccc.grc
-%%DATADIR%%/examples/trellis/sccc1.grc
-%%DATADIR%%/examples/trellis/test_sccc_hard.py
-%%DATADIR%%/examples/trellis/test_sccc_soft.py
-%%DATADIR%%/examples/trellis/test_sccc_turbo.py
-%%DATADIR%%/examples/trellis/test_tcm.py
-%%DATADIR%%/examples/trellis/test_tcm_combined.py
-%%DATADIR%%/examples/trellis/test_tcm_parallel.py
-%%DATADIR%%/examples/trellis/test_turbo_equalization.py
-%%DATADIR%%/examples/trellis/test_turbo_equalization1.py
-%%DATADIR%%/examples/trellis/test_turbo_equalization2.py
-%%DATADIR%%/examples/trellis/test_viterbi_equalization.py
-%%DATADIR%%/examples/trellis/test_viterbi_equalization1.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/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
-%%DATADIR%%/examples/volk_benchmark/volk_math.py
-%%DATADIR%%/examples/volk_benchmark/volk_plot.py
-%%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_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
-%%DATADIR%%/grc/blocks/analog_const_source_x.xml
-%%DATADIR%%/grc/blocks/analog_cpfsk_bc.xml
-%%DATADIR%%/grc/blocks/analog_ctcss_squelch_ff.xml
-%%DATADIR%%/grc/blocks/analog_dpll_bb.xml
-%%DATADIR%%/grc/blocks/analog_fastnoise_source_x.xml
-%%DATADIR%%/grc/blocks/analog_feedforward_agc_cc.xml
-%%DATADIR%%/grc/blocks/analog_fm_deemph.xml
-%%DATADIR%%/grc/blocks/analog_fm_demod_cf.xml
-%%DATADIR%%/grc/blocks/analog_fm_preemph.xml
-%%DATADIR%%/grc/blocks/analog_frequency_modulator_fc.xml
-%%DATADIR%%/grc/blocks/analog_nbfm_rx.xml
-%%DATADIR%%/grc/blocks/analog_nbfm_tx.xml
-%%DATADIR%%/grc/blocks/analog_noise_source_x.xml
-%%DATADIR%%/grc/blocks/analog_phase_modulator_fc.xml
-%%DATADIR%%/grc/blocks/analog_pll_carriertracking_cc.xml
-%%DATADIR%%/grc/blocks/analog_pll_freqdet_cf.xml
-%%DATADIR%%/grc/blocks/analog_pll_refout_cc.xml
-%%DATADIR%%/grc/blocks/analog_probe_avg_mag_sqrd_x.xml
-%%DATADIR%%/grc/blocks/analog_pwr_squelch_xx.xml
-%%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_sig_source_x.xml
-%%DATADIR%%/grc/blocks/analog_simple_squelch_cc.xml
-%%DATADIR%%/grc/blocks/analog_standard_squelch.xml
-%%DATADIR%%/grc/blocks/analog_wfm_rcv.xml
-%%DATADIR%%/grc/blocks/analog_wfm_rcv_pll.xml
-%%DATADIR%%/grc/blocks/analog_wfm_tx.xml
-%%DATADIR%%/grc/blocks/audio_sink.xml
-%%DATADIR%%/grc/blocks/audio_source.xml
-%%DATADIR%%/grc/blocks/blks2_error_rate.xml
-%%DATADIR%%/grc/blocks/blks2_packet_decoder.xml
-%%DATADIR%%/grc/blocks/blks2_packet_encoder.xml
-%%DATADIR%%/grc/blocks/blks2_selector.xml
-%%DATADIR%%/grc/blocks/blks2_tcp_sink.xml
-%%DATADIR%%/grc/blocks/blks2_tcp_source.xml
-%%DATADIR%%/grc/blocks/blks2_valve.xml
-%%DATADIR%%/grc/blocks/block_tree.xml
-%%DATADIR%%/grc/blocks/blocks_abs_xx.xml
-%%DATADIR%%/grc/blocks/blocks_add_const_vxx.xml
-%%DATADIR%%/grc/blocks/blocks_add_xx.xml
-%%DATADIR%%/grc/blocks/blocks_and_const_xx.xml
-%%DATADIR%%/grc/blocks/blocks_and_xx.xml
-%%DATADIR%%/grc/blocks/blocks_argmax_xx.xml
-%%DATADIR%%/grc/blocks/blocks_block_tree.xml
-%%DATADIR%%/grc/blocks/blocks_burst_tagger.xml
-%%DATADIR%%/grc/blocks/blocks_char_to_float.xml
-%%DATADIR%%/grc/blocks/blocks_char_to_short.xml
-%%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_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_real.xml
-%%DATADIR%%/grc/blocks/blocks_conjugate_cc.xml
-%%DATADIR%%/grc/blocks/blocks_copy.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
-%%DATADIR%%/grc/blocks/blocks_endian_swap.xml
-%%DATADIR%%/grc/blocks/blocks_file_descriptor_sink.xml
-%%DATADIR%%/grc/blocks/blocks_file_descriptor_source.xml
-%%DATADIR%%/grc/blocks/blocks_file_meta_sink.xml
-%%DATADIR%%/grc/blocks/blocks_file_meta_source.xml
-%%DATADIR%%/grc/blocks/blocks_file_sink.xml
-%%DATADIR%%/grc/blocks/blocks_file_source.xml
-%%DATADIR%%/grc/blocks/blocks_float_to_char.xml
-%%DATADIR%%/grc/blocks/blocks_float_to_complex.xml
-%%DATADIR%%/grc/blocks/blocks_float_to_int.xml
-%%DATADIR%%/grc/blocks/blocks_float_to_short.xml
-%%DATADIR%%/grc/blocks/blocks_float_uchar.xml
-%%DATADIR%%/grc/blocks/blocks_head.xml
-%%DATADIR%%/grc/blocks/blocks_int_to_float.xml
-%%DATADIR%%/grc/blocks/blocks_integrate_xx.xml
-%%DATADIR%%/grc/blocks/blocks_interleave.xml
-%%DATADIR%%/grc/blocks/blocks_interleaved_char_to_complex.xml
-%%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_max_xx.xml
-%%DATADIR%%/grc/blocks/blocks_message_burst_source.xml
-%%DATADIR%%/grc/blocks/blocks_message_debug.xml
-%%DATADIR%%/grc/blocks/blocks_message_sink.xml
-%%DATADIR%%/grc/blocks/blocks_message_source.xml
-%%DATADIR%%/grc/blocks/blocks_message_strobe.xml
-%%DATADIR%%/grc/blocks/blocks_message_strobe_random.xml
-%%DATADIR%%/grc/blocks/blocks_moving_average_xx.xml
-%%DATADIR%%/grc/blocks/blocks_multiply_conjugate_cc.xml
-%%DATADIR%%/grc/blocks/blocks_multiply_const_vxx.xml
-%%DATADIR%%/grc/blocks/blocks_multiply_xx.xml
-%%DATADIR%%/grc/blocks/blocks_mute_xx.xml
-%%DATADIR%%/grc/blocks/blocks_nlog10_ff.xml
-%%DATADIR%%/grc/blocks/blocks_nop.xml
-%%DATADIR%%/grc/blocks/blocks_not_xx.xml
-%%DATADIR%%/grc/blocks/blocks_null_sink.xml
-%%DATADIR%%/grc/blocks/blocks_null_source.xml
-%%DATADIR%%/grc/blocks/blocks_or_xx.xml
-%%DATADIR%%/grc/blocks/blocks_pack_k_bits_bb.xml
-%%DATADIR%%/grc/blocks/blocks_packed_to_unpacked_xx.xml
-%%DATADIR%%/grc/blocks/blocks_patterned_interleaver.xml
-%%DATADIR%%/grc/blocks/blocks_pdu_filter.xml
-%%DATADIR%%/grc/blocks/blocks_pdu_remove.xml
-%%DATADIR%%/grc/blocks/blocks_pdu_set.xml
-%%DATADIR%%/grc/blocks/blocks_pdu_to_tagged_stream.xml
-%%DATADIR%%/grc/blocks/blocks_peak_detector2_fb.xml
-%%DATADIR%%/grc/blocks/blocks_peak_detector_xb.xml
-%%DATADIR%%/grc/blocks/blocks_plateau_detector_fb.xml
-%%DATADIR%%/grc/blocks/blocks_probe_rate.xml
-%%DATADIR%%/grc/blocks/blocks_probe_signal_vx.xml
-%%DATADIR%%/grc/blocks/blocks_probe_signal_x.xml
-%%DATADIR%%/grc/blocks/blocks_random_pdu.xml
-%%DATADIR%%/grc/blocks/blocks_regenerate_bb.xml
-%%DATADIR%%/grc/blocks/blocks_repack_bits_bb.xml
-%%DATADIR%%/grc/blocks/blocks_repeat.xml
-%%DATADIR%%/grc/blocks/blocks_rms_xx.xml
-%%DATADIR%%/grc/blocks/blocks_rotator_cc.xml
-%%DATADIR%%/grc/blocks/blocks_sample_and_hold_xx.xml
-%%DATADIR%%/grc/blocks/blocks_short_to_char.xml
-%%DATADIR%%/grc/blocks/blocks_short_to_float.xml
-%%DATADIR%%/grc/blocks/blocks_skiphead.xml
-%%DATADIR%%/grc/blocks/blocks_socket_pdu.xml
-%%DATADIR%%/grc/blocks/blocks_stream_mux.xml
-%%DATADIR%%/grc/blocks/blocks_stream_to_streams.xml
-%%DATADIR%%/grc/blocks/blocks_stream_to_tagged_stream.xml
-%%DATADIR%%/grc/blocks/blocks_stream_to_vector.xml
-%%DATADIR%%/grc/blocks/blocks_stream_to_vector_decimator.xml
-%%DATADIR%%/grc/blocks/blocks_streams_to_stream.xml
-%%DATADIR%%/grc/blocks/blocks_streams_to_vector.xml
-%%DATADIR%%/grc/blocks/blocks_stretch_ff.xml
-%%DATADIR%%/grc/blocks/blocks_sub_xx.xml
-%%DATADIR%%/grc/blocks/blocks_tag_debug.xml
-%%DATADIR%%/grc/blocks/blocks_tag_gate.xml
-%%DATADIR%%/grc/blocks/blocks_tagged_file_sink.xml
-%%DATADIR%%/grc/blocks/blocks_tagged_stream_multiply_length.xml
-%%DATADIR%%/grc/blocks/blocks_tagged_stream_mux.xml
-%%DATADIR%%/grc/blocks/blocks_tagged_stream_to_pdu.xml
-%%DATADIR%%/grc/blocks/blocks_tags_strobe.xml
-%%DATADIR%%/grc/blocks/blocks_threshold_ff.xml
-%%DATADIR%%/grc/blocks/blocks_throttle.xml

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

More information about the svn-ports-all mailing list