Date: Sat, 1 Mar 2014 14:32:39 +0000 (UTC) From: Diane Bruce <db@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r346629 - in head/comms/gnuradio: . files Message-ID: <201403011432.s21EWdHj005636@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: db Date: Sat Mar 1 14:32:39 2014 New Revision: 346629 URL: http://svnweb.freebsd.org/changeset/ports/346629 QAT: https://qat.redports.org/buildarchive/r346629/ Log: - Updating to 3.7.2 - disabled USRP default option until usrp is fixed on -10 and head - disable docs on i386 for now as it fails to build - enable staging PR: ports/186799 Submitted by: lev Added: head/comms/gnuradio/files/patch-gnuradio-runtime_lib_thread_thread.cc (contents, props changed) Deleted: head/comms/gnuradio/files/patch-gnuradio-core_CMakeLists.txt head/comms/gnuradio/files/patch-gr-audio_lib_alsa_audio_alsa_sink.cc head/comms/gnuradio/files/patch-gr-audio_lib_alsa_audio_alsa_source.cc head/comms/gnuradio/files/patch-gr-audio_lib_oss_audio_oss_sink.cc head/comms/gnuradio/files/patch-gr-audio_lib_oss_audio_oss_source.cc head/comms/gnuradio/files/patch-gr-utils_src_python_modtool_CMakeLists.txt head/comms/gnuradio/files/patch-gruel_src_lib_thread.cc Modified: head/comms/gnuradio/Makefile head/comms/gnuradio/distinfo (contents, props changed) head/comms/gnuradio/files/patch-CMakeLists.txt (contents, props changed) head/comms/gnuradio/files/patch-cmake_Modules_FindUSB.cmake (contents, props changed) head/comms/gnuradio/files/patch-docs_doxygen_Doxyfile.in (contents, props changed) head/comms/gnuradio/files/patch-gr-audio_lib_CMakeLists.txt (contents, props changed) head/comms/gnuradio/files/patch-gr-fcd_lib_CMakeLists.txt (contents, props changed) head/comms/gnuradio/files/patch-gr-fcd_lib_hid_hid-libusb.c (contents, props changed) head/comms/gnuradio/files/patch-gr-wxgui_CMakeLists.txt (contents, props changed) head/comms/gnuradio/files/patch-volk_CMakeLists.txt (contents, props changed) head/comms/gnuradio/pkg-plist.dirs (contents, props changed) head/comms/gnuradio/pkg-plist.main (contents, props changed) Modified: head/comms/gnuradio/Makefile ============================================================================== --- head/comms/gnuradio/Makefile Sat Mar 1 14:28:08 2014 (r346628) +++ head/comms/gnuradio/Makefile Sat Mar 1 14:32:39 2014 (r346629) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= gnuradio -PORTVERSION= 3.6.5 -PORTREVISION= 4 +PORTVERSION= 3.7.2 CATEGORIES= comms astro hamradio MASTER_SITES= http://gnuradio.org/releases/gnuradio/ \ ${MASTER_SITE_LOCAL} @@ -12,7 +11,7 @@ MAINTAINER= db@FreeBSD.org COMMENT= Amateur Radio Software defined radio BUILD_DEPENDS= sdl-config:${PORTSDIR}/devel/sdl12 \ - swig:${PORTSDIR}/devel/swig13 \ + swig2.0:${PORTSDIR}/devel/swig20 \ cheetah:${PORTSDIR}/devel/py-cheetah \ py*-lxml>=0:${PORTSDIR}/devel/py-lxml \ ${PYTHON_SITELIBDIR}/pygtk.py:${PORTSDIR}/x11-toolkits/py-gtk2 \ @@ -20,7 +19,8 @@ BUILD_DEPENDS= sdl-config:${PORTSDIR}/de xdg-open:${PORTSDIR}/devel/xdg-utils \ guile:${PORTSDIR}/lang/guile \ git:${PORTSDIR}/devel/git -LIB_DEPENDS= libfftw3.so:${PORTSDIR}/math/fftw3 \ +LIB_DEPENDS= libcppunit.so:${PORTSDIR}/devel/cppunit \ + libfftw3.so:${PORTSDIR}/math/fftw3 \ libfftw3f.so:${PORTSDIR}/math/fftw3-float \ libqwt.so:${PORTSDIR}/x11-toolkits/qwt5 \ libboost_python.so:${PORTSDIR}/devel/boost-python-libs \ @@ -32,10 +32,14 @@ RUN_DEPENDS= ${PYNUMPY} \ ${PYTHON_SITELIBDIR}/ephem/__init__.py:${PORTSDIR}/astro/pyephem\ ${PYTHON_SITELIBDIR}/PyQt4/Qt.py:${PORTSDIR}/devel/py-qt4 -USES= cmake:outsource perl5 -CMAKE_VERBOSE= yes +USES= iconv cmake:outsource perl5 +CMAKE_ARGS+= -DSWIG_EXECUTABLE:STRING="${LOCALBASE}/bin/swig2.0" +CMAKE_ARGS+= -DICONV_PREFIX:STRING="${ICONV_PREFIX}" \ + -DICONV_LIB:STRING="X${ICONV_LIB}" +# for detailed debugging uncomment the next line +#CMAKE_ARGS+= --debug-output --trace DOCSDIR= share/doc/${PORTNAME}-${PORTVERSION} -USE_PYTHON= yes +USE_PYTHON= 2.7+ USE_WX= 2.6+ USE_QT4= gui xml qmake moc rcc uic WX_COMPS= wx wx:build wx:run python:build python:run @@ -43,13 +47,15 @@ USE_LDCONFIG= yes PLIST_SUB+= MAJOR_VERSION="3" OPTIONS_DEFINE= USRP TESTING -OPTIONS_DEFAULT= USRP +# Unfortunately building docs on i386 fails +OPTIONS_EXCLUDE_${i386}= DOCS +# turn this off until usrp port is fixed on -10 and HEAD +#OPTIONS_DEFAULT= USRP USRP_DESC= Include USRP support (UHD) from Ettus TESTING_DESC= Include testing support PLIST_SUB+= PORTVERSION=${PORTVERSION} -NO_STAGE= yes .include <bsd.port.pre.mk> .if ${PORT_OPTIONS:MDOCS} @@ -60,12 +66,13 @@ BUILD_DEPENDS+= doxygen:${PORTSDIR}/deve ${LOCALBASE}/lib/X11/fonts/freefont-ttf/fonts.scale:${PORTSDIR}/x11-fonts/freefont-ttf \ latex:${PORTSDIR}/print/teTeX CMAKE_ARGS+= -DENABLE_DOXYGEN:STRING="ON" -CMAKE_ARGS+= -DENABLE_BAD_BOOST="ON" CMAKE_ARGS+= -DENABLE_DOCS:STRING="ON" +CMAKE_ARGS+= -DENABLE_BAD_BOOST="ON" HAVE_PORTDOCS= YES .else CMAKE_ARGS+= -DENABLE_DOXYGEN:STRING="OFF" CMAKE_ARGS+= -DENABLE_DOCS:STRING="OFF" +CMAKE_ARGS+= -DENABLE_BAD_BOOST="ON" .endif .if ${PORT_OPTIONS:MUSRP} @@ -101,6 +108,7 @@ PLIST= ${WRKDIR}/.pkg-plist pre-install: @${RM} -f ${PLIST} @${CAT} ${PLISTMAIN} > ${PLIST} +.if ${PORT_OPTIONS:MDOCS} @cd ${WRKDIR}/.build/docs/doxygen && ${FIND} html -type f | \ ${SED} -e 's|html|%%PORTDOCS%%%%DOCSDIR%%/html|' \ | ${SORT} >> ${PLIST} @@ -121,12 +129,6 @@ pre-install: ${SED} -e 's|xml|%%PORTDOCS%%@dirrm %%DOCSDIR%%/xml|' \ >> ${PLIST} @${ECHO_CMD} "%%PORTDOCS%%@dirrm %%DOCSDIR%%" >> ${PLIST} - -post-install: -.if defined(HAVE_PORTDOCS) - @${ECHO} gnuradio docs are in ${DOCSDIR} .endif - @${ECHO} sample conf files are in ${PREFIX}/etc/gnuradio/conf.d - @${ECHO} .include <bsd.port.post.mk> Modified: head/comms/gnuradio/distinfo ============================================================================== --- head/comms/gnuradio/distinfo Sat Mar 1 14:28:08 2014 (r346628) +++ head/comms/gnuradio/distinfo Sat Mar 1 14:32:39 2014 (r346629) @@ -1,2 +1,2 @@ -SHA256 (gnuradio-3.6.5.tar.gz) = fef4760758d5991ca43c0c5da25bcd2773165499a842638834842d19b07a0546 -SIZE (gnuradio-3.6.5.tar.gz) = 3142693 +SHA256 (gnuradio-3.7.2.tar.gz) = b80b42eaa091cb77a168e15b029307856db249d460ff06dfdf292802c19a2669 +SIZE (gnuradio-3.7.2.tar.gz) = 3105137 Modified: head/comms/gnuradio/files/patch-CMakeLists.txt ============================================================================== --- head/comms/gnuradio/files/patch-CMakeLists.txt Sat Mar 1 14:28:08 2014 (r346628) +++ head/comms/gnuradio/files/patch-CMakeLists.txt Sat Mar 1 14:32:39 2014 (r346629) @@ -1,12 +1,12 @@ ---- CMakeLists.txt.orig 2013-06-04 11:21:38.000000000 -0500 -+++ CMakeLists.txt 2013-06-04 14:46:17.000000000 -0500 -@@ -104,6 +104,14 @@ +--- CMakeLists.txt.orig 2013-11-09 15:25:45.000000000 -0500 ++++ CMakeLists.txt 2014-02-11 20:23:20.000000000 -0500 +@@ -108,6 +108,14 @@ ######################################################################## include(GrPlatform) #define LIB_SUFFIX set(GR_RUNTIME_DIR bin) +######################################################################## -+# FreeBSD needs libiconv -+######################################################################## ++# FreeBSD libdata vs. lib ++# +if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") +set(GR_PKGCONFIG_DIR libdata${LIB_SUFFIX}) +else() @@ -15,30 +15,49 @@ set(GR_LIBRARY_DIR lib${LIB_SUFFIX}) set(GR_INCLUDE_DIR include) set(GR_DATA_DIR share) -@@ -151,6 +159,22 @@ +@@ -163,6 +171,41 @@ ) ######################################################################## -+# FreeBSD needs libiconv ++# FreeBSD iconv +######################################################################## +if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") + message( "-- Adding iconv for FreeBSD") + ++ set (ICONV_INCLUDE_DIR ${ICONV_PREFIX}/include) ++ if (${ICONV_LIB} STREQUAL "X-liconv") ++ find_library(ICONV_LIBRARY ++ NAMES iconv ++ PATHS ${ICONV_PREFIX}/lib ++ ) ++ else() ++ find_library(ICONV_LIBRARY ++ NAMES c ++ PATHS ${ICONV_PREFIX}/lib ++ ) ++ endif() ++ ++message ("-- LIBICONV_PLUG = ${LIBICONV_PLUG}") ++message ("-- ICONV_PREFIX = ${ICONV_PREFIX}") ++message ("-- ICONV_INCLUDE_DIRS = ${ICONV_INCLUDE_DIRS}") ++message ("-- ICONV_INCLUDE_DIR = ${ICONV_INCLUDE_DIR}") ++message ("-- ICONV_LIB_DIRS = ${ICONV_LIB_DIRS}") ++message ("-- ICONV_LIBRARY = ${ICONV_LIBRARY}") ++else() + find_path(ICONV_INCLUDE_DIR + NAMES iconv.h -+ PATHS /usr/local/include ${ICONV_INCLUDE_DIRS} ++ PATHS ${ICONV_INCLUDE_DIRS} + ) -+ + find_library(ICONV_LIBRARY + NAMES iconv -+ PATHS /usr/local/lib ${ICONV_LIB_DIRS} ++ PATHS ${ICONV_LIB_DIRS} + ) +endif() +######################################################################## # Enable python component ######################################################################## - find_package(PythonLibs) -@@ -235,11 +259,13 @@ + find_package(PythonLibs 2) +@@ -247,11 +290,13 @@ ######################################################################## # Distribute the README file ######################################################################## Modified: head/comms/gnuradio/files/patch-cmake_Modules_FindUSB.cmake ============================================================================== --- head/comms/gnuradio/files/patch-cmake_Modules_FindUSB.cmake Sat Mar 1 14:28:08 2014 (r346628) +++ head/comms/gnuradio/files/patch-cmake_Modules_FindUSB.cmake Sat Mar 1 14:32:39 2014 (r346629) @@ -1,6 +1,6 @@ ---- cmake/Modules/FindUSB.cmake.orig 2012-09-04 19:43:06.000000000 -0500 -+++ cmake/Modules/FindUSB.cmake 2012-09-27 14:10:21.000000000 -0500 -@@ -1,20 +1,34 @@ +--- cmake/Modules/FindUSB.cmake.orig 2012-04-09 11:38:58.000000000 -0400 ++++ cmake/Modules/FindUSB.cmake 2014-02-06 10:29:24.962247114 -0500 +@@ -1,20 +1,38 @@ if(NOT LIBUSB_FOUND) - pkg_check_modules (LIBUSB_PKG libusb-1.0) - find_path(LIBUSB_INCLUDE_DIR NAMES libusb.h @@ -13,30 +13,34 @@ /usr/include - /usr/local/include ) ++ message(status "--- LIBUSB_INCLUDE_DIR ${LIBUSB_INCLUDE_DIR}") ++ ++ if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") ++ message(status "--- Looking for FreeBSD usb") ++ find_library(LIBUSB_LIBRARIES NAMES usb ++ PATHS ++ ${LIBUSB_PKG_LIBRARY_DIRS} ++ /usr/lib ++ ) ++ ++ message(status "--- LIBUSB_LIBRARIES ${LIBUSB_LIBRARIES}") - find_library(LIBUSB_LIBRARIES NAMES usb-1.0 -+ if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") -+ message(status " Looking for FreeBSD usb") -+ find_library(LIBUSB_LIBRARIES NAMES usb-1.0 -+ PATHS -+ ${LIBUSB_PKG_LIBRARY_DIRS} -+ /usr/lib -+ ) -+ elseif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") -+ 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 + /usr/local/lib ) -+ endif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") - -+ find_library(LIBUSB_LIBRARIES NAMES usb -+ PATHS -+ ${LIBUSB_PKG_LIBRARY_DIRS} -+ /usr/lib -+ /usr/local/lib -+ ) +- 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}") Modified: head/comms/gnuradio/files/patch-docs_doxygen_Doxyfile.in ============================================================================== --- head/comms/gnuradio/files/patch-docs_doxygen_Doxyfile.in Sat Mar 1 14:28:08 2014 (r346628) +++ head/comms/gnuradio/files/patch-docs_doxygen_Doxyfile.in Sat Mar 1 14:32:39 2014 (r346629) @@ -1,6 +1,6 @@ ---- docs/doxygen/Doxyfile.in.orig 2013-01-08 15:56:55.000000000 -0500 -+++ docs/doxygen/Doxyfile.in 2013-02-23 13:31:16.000000000 -0500 -@@ -1399,7 +1399,7 @@ +--- docs/doxygen/Doxyfile.in.orig 2013-08-28 14:27:03.000000000 -0400 ++++ docs/doxygen/Doxyfile.in 2013-12-24 23:01:10.792101888 -0500 +@@ -1406,7 +1406,7 @@ # different font using DOT_FONTNAME you can set the path where dot # can find it using this tag. Added: head/comms/gnuradio/files/patch-gnuradio-runtime_lib_thread_thread.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/gnuradio/files/patch-gnuradio-runtime_lib_thread_thread.cc Sat Mar 1 14:32:39 2014 (r346629) @@ -0,0 +1,34 @@ +--- gnuradio-runtime/lib/thread/thread.cc.orig 2013-08-28 14:27:03.000000000 -0400 ++++ gnuradio-runtime/lib/thread/thread.cc 2014-01-05 20:39:46.220592423 -0500 +@@ -217,6 +217,7 @@ + void + thread_bind_to_processor(gr_thread_t thread, const std::vector<int> &mask) + { ++#ifdef _GNU_SOURCE + cpu_set_t set; + size_t len = sizeof(cpu_set_t); + std::vector<int> _mask = mask; +@@ -232,6 +233,7 @@ + s << "thread_bind_to_processor failed with error: " << ret << std::endl; + throw std::runtime_error(s.str()); + } ++#endif + } + + void +@@ -243,6 +245,7 @@ + void + thread_unbind(gr_thread_t thread) + { ++#ifdef _GNU_SOURCE + cpu_set_t set; + size_t len = sizeof(cpu_set_t); + +@@ -258,6 +261,7 @@ + s << "thread_unbind failed with error: " << ret << std::endl; + throw std::runtime_error(s.str()); + } ++#endif + } + + int Modified: head/comms/gnuradio/files/patch-gr-audio_lib_CMakeLists.txt ============================================================================== --- head/comms/gnuradio/files/patch-gr-audio_lib_CMakeLists.txt Sat Mar 1 14:28:08 2014 (r346628) +++ head/comms/gnuradio/files/patch-gr-audio_lib_CMakeLists.txt Sat Mar 1 14:32:39 2014 (r346629) @@ -1,26 +1,13 @@ ---- gr-audio/lib/CMakeLists.txt.orig 2013-05-01 18:57:50.000000000 -0500 -+++ gr-audio/lib/CMakeLists.txt 2013-06-07 15:29:10.000000000 -0500 -@@ -120,8 +120,8 @@ - find_package(Portaudio) +--- gr-audio/lib/CMakeLists.txt.orig 2014-01-06 18:25:13.000000000 -0500 ++++ gr-audio/lib/CMakeLists.txt 2014-01-08 17:25:40.000000000 -0500 +@@ -127,8 +127,8 @@ if(PORTAUDIO_FOUND) -- -- include_directories(${CMAKE_CURRENT_SOURCE_DIR}/portaudio ${PORTAUDIO_INCLUDE_DIRS}) + +- include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/portaudio) +- include_directories(${PORTAUDIO_INCLUDE_DIRS}) + include_directories(${CMAKE_CURRENT_SOURCE_DIR}/portaudio) + include_directories(BEFORE ${PORTAUDIO_INCLUDE_DIRS}) list(APPEND gr_audio_libs ${PORTAUDIO_LIBRARIES}) add_definitions(${PORTAUDIO_DEFINITIONS}) list(APPEND gr_audio_sources -@@ -169,3 +169,12 @@ - GR_LIBRARY_FOO(gnuradio-audio RUNTIME_COMPONENT "audio_runtime" DEVEL_COMPONENT "audio_devel") - - install(FILES ${gr_audio_confs} DESTINATION ${GR_PREFSDIR} COMPONENT "audio_runtime") -+# Install an original copy for FreeBSD -+if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") -+foreach(conf_file ${gr_audio_confs}) -+ get_filename_component(nconf_file ${conf_file} NAME) -+ install(FILES ${conf_file} DESTINATION ${GR_PREFSDIR} RENAME ${nconf_file}.sample COMPONENT "audio_run_time") -+endforeach(conf_file) -+elseif() -+ install(FILES ${gr_audio_confs} DESTINATION ${GR_PREFSDIR} COMPONENT "audio_runtime") -+endif() Modified: head/comms/gnuradio/files/patch-gr-fcd_lib_CMakeLists.txt ============================================================================== --- head/comms/gnuradio/files/patch-gr-fcd_lib_CMakeLists.txt Sat Mar 1 14:28:08 2014 (r346628) +++ head/comms/gnuradio/files/patch-gr-fcd_lib_CMakeLists.txt Sat Mar 1 14:32:39 2014 (r346629) @@ -1,14 +1,14 @@ ---- gr-fcd/lib/CMakeLists.txt.orig 2013-05-01 18:57:50.000000000 -0500 -+++ gr-fcd/lib/CMakeLists.txt 2013-05-30 06:47:03.000000000 -0500 +--- gr-fcd/lib/CMakeLists.txt.orig 2013-08-28 14:27:03.000000000 -0400 ++++ gr-fcd/lib/CMakeLists.txt 2013-12-24 23:02:13.410098101 -0500 @@ -32,6 +32,7 @@ - ${GRUEL_INCLUDE_DIRS} + ${GNURADIO_RUNTIME_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${LIBUSB_INCLUDE_DIR} + ${ICONV_INCLUDE_DIRS} ) - link_directories(${Boost_LIBRARY_DIRS}) -@@ -82,6 +83,10 @@ + link_directories( +@@ -91,6 +92,10 @@ 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 Sat Mar 1 14:28:08 2014 (r346628) +++ head/comms/gnuradio/files/patch-gr-fcd_lib_hid_hid-libusb.c Sat Mar 1 14:32:39 2014 (r346629) @@ -1,42 +1,24 @@ ---- gr-fcd/lib/hid/hid-libusb.c.orig 2012-09-27 14:50:40.000000000 -0500 -+++ gr-fcd/lib/hid/hid-libusb.c 2012-09-27 15:45:03.000000000 -0500 -@@ -48,6 +48,12 @@ +--- gr-fcd/lib/hid/hid-libusb.c.orig 2013-08-28 13:27:03.000000000 -0500 ++++ gr-fcd/lib/hid/hid-libusb.c 2014-01-16 20:59:56.000000000 -0500 +@@ -250,7 +250,7 @@ + } + #endif /* INVASIVE_GET_USAGE */ - #include "hidapi.h" +-#ifdef __FreeBSD__ ++#ifndef HAVE_LIBUSB_GET_STRING_DESCRIPTOR + /* The FreeBSD version of libusb doesn't have this funciton. 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 @@ + if no transfers are pending, but that's OK. */ + libusb_cancel_transfer(dev->transfer); -+#ifdef __FreeBSD__ -+#define LIBUSB_GET_STRING_DESCRIPTOR(h,i,l,d,n) libusb_get_string_descriptor_ascii(h,i,d,n) -+#else -+#define LIBUSB_GET_STRING_DESCRIPTOR(h,i,l,d,n) libusb_get_string_descriptor(h,i,l,d,n) ++#if 0 + while (!dev->cancelled) + libusb_handle_events_completed(usb_context, &dev->cancelled); +#endif -+ - #ifdef __cplusplus - extern "C" { - #endif -@@ -264,7 +270,7 @@ - int len; ++ while (!dev->cancelled) ++ libusb_handle_events(NULL); - /* Get the string from libusb. */ -- len = libusb_get_string_descriptor(dev, -+ len = LIBUSB_GET_STRING_DESCRIPTOR(dev, - 0x0, /* String ID */ - 0x0, /* Language */ - (unsigned char*)buf, -@@ -282,7 +288,7 @@ - int i; - - /* Get the string from libusb. */ -- len = libusb_get_string_descriptor(dev, -+ len = LIBUSB_GET_STRING_DESCRIPTOR(dev, - 0x0, /* String ID */ - 0x0, /* Language */ - (unsigned char*)buf, -@@ -327,7 +333,7 @@ - lang = get_first_language(dev); - - /* Get the string from libusb. */ -- len = libusb_get_string_descriptor(dev, -+ len = LIBUSB_GET_STRING_DESCRIPTOR(dev, - idx, - lang, - (unsigned char*)buf, + /* Now that the read thread is stopping, Wake any threads which are + waiting on data (in hid_read_timeout()). Do this under a mutex to Modified: head/comms/gnuradio/files/patch-gr-wxgui_CMakeLists.txt ============================================================================== --- head/comms/gnuradio/files/patch-gr-wxgui_CMakeLists.txt Sat Mar 1 14:28:08 2014 (r346628) +++ head/comms/gnuradio/files/patch-gr-wxgui_CMakeLists.txt Sat Mar 1 14:32:39 2014 (r346629) @@ -1,6 +1,6 @@ ---- gr-wxgui/CMakeLists.txt.orig 2013-05-01 18:57:50.000000000 -0500 -+++ gr-wxgui/CMakeLists.txt 2013-06-07 15:32:29.000000000 -0500 -@@ -74,12 +74,21 @@ +--- gr-wxgui/CMakeLists.txt.orig 2013-11-04 13:50:36.000000000 -0500 ++++ gr-wxgui/CMakeLists.txt 2013-12-24 23:03:04.541093727 -0500 +@@ -106,12 +106,21 @@ ######################################################################## # Install the conf file ######################################################################## Modified: head/comms/gnuradio/files/patch-volk_CMakeLists.txt ============================================================================== --- head/comms/gnuradio/files/patch-volk_CMakeLists.txt Sat Mar 1 14:28:08 2014 (r346628) +++ head/comms/gnuradio/files/patch-volk_CMakeLists.txt Sat Mar 1 14:32:39 2014 (r346629) @@ -1,6 +1,6 @@ ---- volk/CMakeLists.txt.orig 2013-01-08 15:56:55.000000000 -0500 -+++ volk/CMakeLists.txt 2013-03-11 21:06:45.000000000 -0500 -@@ -95,7 +95,7 @@ +--- volk/CMakeLists.txt.orig 2013-08-28 14:27:03.000000000 -0400 ++++ volk/CMakeLists.txt 2013-12-24 23:03:29.644092599 -0500 +@@ -97,7 +97,7 @@ install( FILES ${CMAKE_CURRENT_BINARY_DIR}/volk.pc Modified: head/comms/gnuradio/pkg-plist.dirs ============================================================================== --- head/comms/gnuradio/pkg-plist.dirs Sat Mar 1 14:28:08 2014 (r346628) +++ head/comms/gnuradio/pkg-plist.dirs Sat Mar 1 14:32:39 2014 (r346629) @@ -1,7 +1,5 @@ @dirrm %%PYTHON_SITELIBDIR%%/gnuradio/analog @dirrm %%PYTHON_SITELIBDIR%%/gnuradio/audio -@dirrm %%PYTHON_SITELIBDIR%%/gnuradio/blks2 -@dirrm %%PYTHON_SITELIBDIR%%/gnuradio/blks2impl @dirrm %%PYTHON_SITELIBDIR%%/gnuradio/blocks @dirrm %%PYTHON_SITELIBDIR%%/gnuradio/digital/utils @dirrm %%PYTHON_SITELIBDIR%%/gnuradio/digital @@ -14,7 +12,6 @@ @dirrm %%PYTHON_SITELIBDIR%%/gnuradio/grc/python @dirrm %%PYTHON_SITELIBDIR%%/gnuradio/grc @dirrm %%PYTHON_SITELIBDIR%%/gnuradio/gru -@dirrm %%PYTHON_SITELIBDIR%%/gnuradio/gruimpl @dirrm %%PYTHON_SITELIBDIR%%/gnuradio/noaa @dirrm %%PYTHON_SITELIBDIR%%/gnuradio/pager @dirrm %%PYTHON_SITELIBDIR%%/gnuradio/qtgui @@ -29,8 +26,6 @@ @dirrm %%PYTHON_SITELIBDIR%%/grc_gnuradio/blks2 @dirrm %%PYTHON_SITELIBDIR%%/grc_gnuradio/wxgui @dirrm %%PYTHON_SITELIBDIR%%/grc_gnuradio -@dirrm %%PYTHON_SITELIBDIR%%/gruel/pmt -@dirrm %%PYTHON_SITELIBDIR%%/gruel @dirrmtry etc/gnuradio/conf.d @dirrmtry etc/gnuradio @dirrm include/gnuradio/analog @@ -40,8 +35,6 @@ @dirrm include/gnuradio/filter @dirrm include/gnuradio/swig @dirrm include/gnuradio -@dirrm include/gruel/swig -@dirrm include/gruel @dirrm include/volk @dirrm lib/cmake/gnuradio @dirrmtry lib/cmake @@ -60,11 +53,9 @@ @dirrm share/gnuradio/examples/grc %%UHD%%@dirrm share/gnuradio/examples/hf_radio @dirrm share/gnuradio/examples/metadata -@dirrm share/gnuradio/examples/msg_passing @dirrm share/gnuradio/examples/mp-sched @dirrm share/gnuradio/examples/network @dirrm share/gnuradio/examples/noaa -@dirrm share/gnuradio/examples/pfb @dirrm share/gnuradio/examples/qt-gui @dirrm share/gnuradio/examples/tags @dirrm share/gnuradio/examples/trellis/fsm_files Modified: head/comms/gnuradio/pkg-plist.main ============================================================================== --- head/comms/gnuradio/pkg-plist.main Sat Mar 1 14:28:08 2014 (r346628) +++ head/comms/gnuradio/pkg-plist.main Sat Mar 1 14:32:39 2014 (r346629) @@ -12,9 +12,6 @@ %%PYTHON_SITELIBDIR%%/gnuradio/__init__.py %%PYTHON_SITELIBDIR%%/gnuradio/__init__.pyc %%PYTHON_SITELIBDIR%%/gnuradio/__init__.pyo -%%PYTHON_SITELIBDIR%%/gnuradio/_atsc.so -%%PYTHON_SITELIBDIR%%/gnuradio/_trellis.so -%%PYTHON_SITELIBDIR%%/gnuradio/_video_sdl.so %%PYTHON_SITELIBDIR%%/gnuradio/analog/__init__.py %%PYTHON_SITELIBDIR%%/gnuradio/analog/__init__.pyc %%PYTHON_SITELIBDIR%%/gnuradio/analog/__init__.pyo @@ -22,9 +19,6 @@ %%PYTHON_SITELIBDIR%%/gnuradio/analog/analog_swig.py %%PYTHON_SITELIBDIR%%/gnuradio/analog/analog_swig.pyc %%PYTHON_SITELIBDIR%%/gnuradio/analog/analog_swig.pyo -%%PYTHON_SITELIBDIR%%/gnuradio/atsc.py -%%PYTHON_SITELIBDIR%%/gnuradio/atsc.pyc -%%PYTHON_SITELIBDIR%%/gnuradio/atsc.pyo %%PYTHON_SITELIBDIR%%/gnuradio/audio/__init__.py %%PYTHON_SITELIBDIR%%/gnuradio/audio/__init__.pyc %%PYTHON_SITELIBDIR%%/gnuradio/audio/__init__.pyo @@ -32,69 +26,6 @@ %%PYTHON_SITELIBDIR%%/gnuradio/audio/audio_swig.py %%PYTHON_SITELIBDIR%%/gnuradio/audio/audio_swig.pyc %%PYTHON_SITELIBDIR%%/gnuradio/audio/audio_swig.pyo -%%PYTHON_SITELIBDIR%%/gnuradio/blks2/__init__.py -%%PYTHON_SITELIBDIR%%/gnuradio/blks2/__init__.pyc -%%PYTHON_SITELIBDIR%%/gnuradio/blks2/__init__.pyo -%%PYTHON_SITELIBDIR%%/gnuradio/blks2impl/__init__.py -%%PYTHON_SITELIBDIR%%/gnuradio/blks2impl/__init__.pyc -%%PYTHON_SITELIBDIR%%/gnuradio/blks2impl/__init__.pyo -%%PYTHON_SITELIBDIR%%/gnuradio/blks2impl/am_demod.py -%%PYTHON_SITELIBDIR%%/gnuradio/blks2impl/am_demod.pyc -%%PYTHON_SITELIBDIR%%/gnuradio/blks2impl/am_demod.pyo -%%PYTHON_SITELIBDIR%%/gnuradio/blks2impl/channel_model.py -%%PYTHON_SITELIBDIR%%/gnuradio/blks2impl/channel_model.pyc -%%PYTHON_SITELIBDIR%%/gnuradio/blks2impl/channel_model.pyo -%%PYTHON_SITELIBDIR%%/gnuradio/blks2impl/filterbank.py -%%PYTHON_SITELIBDIR%%/gnuradio/blks2impl/filterbank.pyc -%%PYTHON_SITELIBDIR%%/gnuradio/blks2impl/filterbank.pyo -%%PYTHON_SITELIBDIR%%/gnuradio/blks2impl/fm_demod.py -%%PYTHON_SITELIBDIR%%/gnuradio/blks2impl/fm_demod.pyc -%%PYTHON_SITELIBDIR%%/gnuradio/blks2impl/fm_demod.pyo -%%PYTHON_SITELIBDIR%%/gnuradio/blks2impl/fm_emph.py -%%PYTHON_SITELIBDIR%%/gnuradio/blks2impl/fm_emph.pyc -%%PYTHON_SITELIBDIR%%/gnuradio/blks2impl/fm_emph.pyo -%%PYTHON_SITELIBDIR%%/gnuradio/blks2impl/logpwrfft.py -%%PYTHON_SITELIBDIR%%/gnuradio/blks2impl/logpwrfft.pyc -%%PYTHON_SITELIBDIR%%/gnuradio/blks2impl/logpwrfft.pyo -%%PYTHON_SITELIBDIR%%/gnuradio/blks2impl/nbfm_rx.py -%%PYTHON_SITELIBDIR%%/gnuradio/blks2impl/nbfm_rx.pyc -%%PYTHON_SITELIBDIR%%/gnuradio/blks2impl/nbfm_rx.pyo -%%PYTHON_SITELIBDIR%%/gnuradio/blks2impl/nbfm_tx.py -%%PYTHON_SITELIBDIR%%/gnuradio/blks2impl/nbfm_tx.pyc -%%PYTHON_SITELIBDIR%%/gnuradio/blks2impl/nbfm_tx.pyo -%%PYTHON_SITELIBDIR%%/gnuradio/blks2impl/pfb_arb_resampler.py -%%PYTHON_SITELIBDIR%%/gnuradio/blks2impl/pfb_arb_resampler.pyc -%%PYTHON_SITELIBDIR%%/gnuradio/blks2impl/pfb_arb_resampler.pyo -%%PYTHON_SITELIBDIR%%/gnuradio/blks2impl/pfb_channelizer.py -%%PYTHON_SITELIBDIR%%/gnuradio/blks2impl/pfb_channelizer.pyc -%%PYTHON_SITELIBDIR%%/gnuradio/blks2impl/pfb_channelizer.pyo -%%PYTHON_SITELIBDIR%%/gnuradio/blks2impl/pfb_decimator.py -%%PYTHON_SITELIBDIR%%/gnuradio/blks2impl/pfb_decimator.pyc -%%PYTHON_SITELIBDIR%%/gnuradio/blks2impl/pfb_decimator.pyo -%%PYTHON_SITELIBDIR%%/gnuradio/blks2impl/pfb_interpolator.py -%%PYTHON_SITELIBDIR%%/gnuradio/blks2impl/pfb_interpolator.pyc -%%PYTHON_SITELIBDIR%%/gnuradio/blks2impl/pfb_interpolator.pyo -%%PYTHON_SITELIBDIR%%/gnuradio/blks2impl/rational_resampler.py -%%PYTHON_SITELIBDIR%%/gnuradio/blks2impl/rational_resampler.pyc -%%PYTHON_SITELIBDIR%%/gnuradio/blks2impl/rational_resampler.pyo -%%PYTHON_SITELIBDIR%%/gnuradio/blks2impl/standard_squelch.py -%%PYTHON_SITELIBDIR%%/gnuradio/blks2impl/standard_squelch.pyc -%%PYTHON_SITELIBDIR%%/gnuradio/blks2impl/standard_squelch.pyo -%%PYTHON_SITELIBDIR%%/gnuradio/blks2impl/stream_to_vector_decimator.py -%%PYTHON_SITELIBDIR%%/gnuradio/blks2impl/stream_to_vector_decimator.pyc -%%PYTHON_SITELIBDIR%%/gnuradio/blks2impl/stream_to_vector_decimator.pyo -%%PYTHON_SITELIBDIR%%/gnuradio/blks2impl/wfm_rcv.py -%%PYTHON_SITELIBDIR%%/gnuradio/blks2impl/wfm_rcv.pyc -%%PYTHON_SITELIBDIR%%/gnuradio/blks2impl/wfm_rcv.pyo -%%PYTHON_SITELIBDIR%%/gnuradio/blks2impl/wfm_rcv_fmdet.py -%%PYTHON_SITELIBDIR%%/gnuradio/blks2impl/wfm_rcv_fmdet.pyc -%%PYTHON_SITELIBDIR%%/gnuradio/blks2impl/wfm_rcv_fmdet.pyo -%%PYTHON_SITELIBDIR%%/gnuradio/blks2impl/wfm_rcv_pll.py -%%PYTHON_SITELIBDIR%%/gnuradio/blks2impl/wfm_rcv_pll.pyc -%%PYTHON_SITELIBDIR%%/gnuradio/blks2impl/wfm_rcv_pll.pyo -%%PYTHON_SITELIBDIR%%/gnuradio/blks2impl/wfm_tx.py -%%PYTHON_SITELIBDIR%%/gnuradio/blks2impl/wfm_tx.pyc -%%PYTHON_SITELIBDIR%%/gnuradio/blks2impl/wfm_tx.pyo %%PYTHON_SITELIBDIR%%/gnuradio/blocks/__init__.py %%PYTHON_SITELIBDIR%%/gnuradio/blocks/__init__.pyc %%PYTHON_SITELIBDIR%%/gnuradio/blocks/__init__.pyo @@ -240,39 +171,9 @@ %%PYTHON_SITELIBDIR%%/gnuradio/gr/__init__.py %%PYTHON_SITELIBDIR%%/gnuradio/gr/__init__.pyc %%PYTHON_SITELIBDIR%%/gnuradio/gr/__init__.pyo -%%PYTHON_SITELIBDIR%%/gnuradio/gr/_gnuradio_core_filter.so -%%PYTHON_SITELIBDIR%%/gnuradio/gr/_gnuradio_core_general.so -%%PYTHON_SITELIBDIR%%/gnuradio/gr/_gnuradio_core_gengen.so -%%PYTHON_SITELIBDIR%%/gnuradio/gr/_gnuradio_core_hier.so -%%PYTHON_SITELIBDIR%%/gnuradio/gr/_gnuradio_core_io.so -%%PYTHON_SITELIBDIR%%/gnuradio/gr/_gnuradio_core_runtime.so -%%PYTHON_SITELIBDIR%%/gnuradio/gr/exceptions.py -%%PYTHON_SITELIBDIR%%/gnuradio/gr/exceptions.pyc -%%PYTHON_SITELIBDIR%%/gnuradio/gr/exceptions.pyo %%PYTHON_SITELIBDIR%%/gnuradio/gr/gateway.py %%PYTHON_SITELIBDIR%%/gnuradio/gr/gateway.pyc %%PYTHON_SITELIBDIR%%/gnuradio/gr/gateway.pyo -%%PYTHON_SITELIBDIR%%/gnuradio/gr/gnuradio_core.py -%%PYTHON_SITELIBDIR%%/gnuradio/gr/gnuradio_core.pyc -%%PYTHON_SITELIBDIR%%/gnuradio/gr/gnuradio_core.pyo -%%PYTHON_SITELIBDIR%%/gnuradio/gr/gnuradio_core_filter.py -%%PYTHON_SITELIBDIR%%/gnuradio/gr/gnuradio_core_filter.pyc -%%PYTHON_SITELIBDIR%%/gnuradio/gr/gnuradio_core_filter.pyo -%%PYTHON_SITELIBDIR%%/gnuradio/gr/gnuradio_core_general.py -%%PYTHON_SITELIBDIR%%/gnuradio/gr/gnuradio_core_general.pyc -%%PYTHON_SITELIBDIR%%/gnuradio/gr/gnuradio_core_general.pyo -%%PYTHON_SITELIBDIR%%/gnuradio/gr/gnuradio_core_gengen.py -%%PYTHON_SITELIBDIR%%/gnuradio/gr/gnuradio_core_gengen.pyc -%%PYTHON_SITELIBDIR%%/gnuradio/gr/gnuradio_core_gengen.pyo -%%PYTHON_SITELIBDIR%%/gnuradio/gr/gnuradio_core_hier.py -%%PYTHON_SITELIBDIR%%/gnuradio/gr/gnuradio_core_hier.pyc -%%PYTHON_SITELIBDIR%%/gnuradio/gr/gnuradio_core_hier.pyo -%%PYTHON_SITELIBDIR%%/gnuradio/gr/gnuradio_core_io.py -%%PYTHON_SITELIBDIR%%/gnuradio/gr/gnuradio_core_io.pyc -%%PYTHON_SITELIBDIR%%/gnuradio/gr/gnuradio_core_io.pyo -%%PYTHON_SITELIBDIR%%/gnuradio/gr/gnuradio_core_runtime.py -%%PYTHON_SITELIBDIR%%/gnuradio/gr/gnuradio_core_runtime.pyc -%%PYTHON_SITELIBDIR%%/gnuradio/gr/gnuradio_core_runtime.pyo %%PYTHON_SITELIBDIR%%/gnuradio/gr/gr_threading.py %%PYTHON_SITELIBDIR%%/gnuradio/gr/gr_threading.pyc %%PYTHON_SITELIBDIR%%/gnuradio/gr/gr_threading.pyo @@ -285,9 +186,6 @@ %%PYTHON_SITELIBDIR%%/gnuradio/gr/hier_block2.py %%PYTHON_SITELIBDIR%%/gnuradio/gr/hier_block2.pyc %%PYTHON_SITELIBDIR%%/gnuradio/gr/hier_block2.pyo -%%PYTHON_SITELIBDIR%%/gnuradio/gr/prefs.py -%%PYTHON_SITELIBDIR%%/gnuradio/gr/prefs.pyc -%%PYTHON_SITELIBDIR%%/gnuradio/gr/prefs.pyo %%PYTHON_SITELIBDIR%%/gnuradio/gr/pubsub.py %%PYTHON_SITELIBDIR%%/gnuradio/gr/pubsub.pyc %%PYTHON_SITELIBDIR%%/gnuradio/gr/pubsub.pyo @@ -455,45 +353,6 @@ %%PYTHON_SITELIBDIR%%/gnuradio/gru/__init__.py %%PYTHON_SITELIBDIR%%/gnuradio/gru/__init__.pyc %%PYTHON_SITELIBDIR%%/gnuradio/gru/__init__.pyo -%%PYTHON_SITELIBDIR%%/gnuradio/gruimpl/__init__.py -%%PYTHON_SITELIBDIR%%/gnuradio/gruimpl/__init__.pyc -%%PYTHON_SITELIBDIR%%/gnuradio/gruimpl/__init__.pyo -%%PYTHON_SITELIBDIR%%/gnuradio/gruimpl/daemon.py -%%PYTHON_SITELIBDIR%%/gnuradio/gruimpl/daemon.pyc -%%PYTHON_SITELIBDIR%%/gnuradio/gruimpl/daemon.pyo -%%PYTHON_SITELIBDIR%%/gnuradio/gruimpl/freqz.py -%%PYTHON_SITELIBDIR%%/gnuradio/gruimpl/freqz.pyc -%%PYTHON_SITELIBDIR%%/gnuradio/gruimpl/freqz.pyo -%%PYTHON_SITELIBDIR%%/gnuradio/gruimpl/gnuplot_freqz.py -%%PYTHON_SITELIBDIR%%/gnuradio/gruimpl/gnuplot_freqz.pyc -%%PYTHON_SITELIBDIR%%/gnuradio/gruimpl/gnuplot_freqz.pyo -%%PYTHON_SITELIBDIR%%/gnuradio/gruimpl/hexint.py -%%PYTHON_SITELIBDIR%%/gnuradio/gruimpl/hexint.pyc -%%PYTHON_SITELIBDIR%%/gnuradio/gruimpl/hexint.pyo -%%PYTHON_SITELIBDIR%%/gnuradio/gruimpl/listmisc.py -%%PYTHON_SITELIBDIR%%/gnuradio/gruimpl/listmisc.pyc -%%PYTHON_SITELIBDIR%%/gnuradio/gruimpl/listmisc.pyo -%%PYTHON_SITELIBDIR%%/gnuradio/gruimpl/lmx2306.py -%%PYTHON_SITELIBDIR%%/gnuradio/gruimpl/lmx2306.pyc -%%PYTHON_SITELIBDIR%%/gnuradio/gruimpl/lmx2306.pyo -%%PYTHON_SITELIBDIR%%/gnuradio/gruimpl/mathmisc.py -%%PYTHON_SITELIBDIR%%/gnuradio/gruimpl/mathmisc.pyc -%%PYTHON_SITELIBDIR%%/gnuradio/gruimpl/mathmisc.pyo -%%PYTHON_SITELIBDIR%%/gnuradio/gruimpl/msgq_runner.py -%%PYTHON_SITELIBDIR%%/gnuradio/gruimpl/msgq_runner.pyc -%%PYTHON_SITELIBDIR%%/gnuradio/gruimpl/msgq_runner.pyo -%%PYTHON_SITELIBDIR%%/gnuradio/gruimpl/os_read_exactly.py -%%PYTHON_SITELIBDIR%%/gnuradio/gruimpl/os_read_exactly.pyc -%%PYTHON_SITELIBDIR%%/gnuradio/gruimpl/os_read_exactly.pyo -%%PYTHON_SITELIBDIR%%/gnuradio/gruimpl/sdr_1000.py -%%PYTHON_SITELIBDIR%%/gnuradio/gruimpl/sdr_1000.pyc -%%PYTHON_SITELIBDIR%%/gnuradio/gruimpl/sdr_1000.pyo -%%PYTHON_SITELIBDIR%%/gnuradio/gruimpl/seq_with_cursor.py -%%PYTHON_SITELIBDIR%%/gnuradio/gruimpl/seq_with_cursor.pyc -%%PYTHON_SITELIBDIR%%/gnuradio/gruimpl/seq_with_cursor.pyo -%%PYTHON_SITELIBDIR%%/gnuradio/gruimpl/socket_stuff.py -%%PYTHON_SITELIBDIR%%/gnuradio/gruimpl/socket_stuff.pyc -%%PYTHON_SITELIBDIR%%/gnuradio/gruimpl/socket_stuff.pyo %%PYTHON_SITELIBDIR%%/gnuradio/modtool/__init__.py %%PYTHON_SITELIBDIR%%/gnuradio/modtool/__init__.pyc %%PYTHON_SITELIBDIR%%/gnuradio/modtool/__init__.pyo @@ -546,9 +405,6 @@ %%PYTHON_SITELIBDIR%%/gnuradio/noaa/noaa_swig.py %%PYTHON_SITELIBDIR%%/gnuradio/noaa/noaa_swig.pyc %%PYTHON_SITELIBDIR%%/gnuradio/noaa/noaa_swig.pyo -%%PYTHON_SITELIBDIR%%/gnuradio/optfir.py -%%PYTHON_SITELIBDIR%%/gnuradio/optfir.pyc -%%PYTHON_SITELIBDIR%%/gnuradio/optfir.pyo %%PYTHON_SITELIBDIR%%/gnuradio/pager/__init__.py %%PYTHON_SITELIBDIR%%/gnuradio/pager/__init__.pyc %%PYTHON_SITELIBDIR%%/gnuradio/pager/__init__.pyo @@ -584,12 +440,6 @@ %%PYTHON_SITELIBDIR%%/gnuradio/qtgui/qtgui_swig.py %%PYTHON_SITELIBDIR%%/gnuradio/qtgui/qtgui_swig.pyc %%PYTHON_SITELIBDIR%%/gnuradio/qtgui/qtgui_swig.pyo -%%PYTHON_SITELIBDIR%%/gnuradio/trellis.py -%%PYTHON_SITELIBDIR%%/gnuradio/trellis.pyc -%%PYTHON_SITELIBDIR%%/gnuradio/trellis.pyo -%%PYTHON_SITELIBDIR%%/gnuradio/video_sdl.py -%%PYTHON_SITELIBDIR%%/gnuradio/video_sdl.pyc -%%PYTHON_SITELIBDIR%%/gnuradio/video_sdl.pyo %%PYTHON_SITELIBDIR%%/gnuradio/vocoder/__init__.py %%PYTHON_SITELIBDIR%%/gnuradio/vocoder/__init__.pyc %%PYTHON_SITELIBDIR%%/gnuradio/vocoder/__init__.pyo @@ -607,9 +457,6 @@ %%PYTHON_SITELIBDIR%%/gnuradio/wavelet/wavelet_swig.py %%PYTHON_SITELIBDIR%%/gnuradio/wavelet/wavelet_swig.pyc %%PYTHON_SITELIBDIR%%/gnuradio/wavelet/wavelet_swig.pyo -%%PYTHON_SITELIBDIR%%/gnuradio/window.py -%%PYTHON_SITELIBDIR%%/gnuradio/window.pyc -%%PYTHON_SITELIBDIR%%/gnuradio/window.pyo %%PYTHON_SITELIBDIR%%/gnuradio/wxgui/__init__.py %%PYTHON_SITELIBDIR%%/gnuradio/wxgui/__init__.pyc %%PYTHON_SITELIBDIR%%/gnuradio/wxgui/__init__.pyo @@ -757,19 +604,6 @@ %%PYTHON_SITELIBDIR%%/grc_gnuradio/wxgui/top_block_gui.py %%PYTHON_SITELIBDIR%%/grc_gnuradio/wxgui/top_block_gui.pyc %%PYTHON_SITELIBDIR%%/grc_gnuradio/wxgui/top_block_gui.pyo -%%PYTHON_SITELIBDIR%%/gruel/__init__.py -%%PYTHON_SITELIBDIR%%/gruel/__init__.pyc -%%PYTHON_SITELIBDIR%%/gruel/__init__.pyo -%%PYTHON_SITELIBDIR%%/gruel/pmt/__init__.py -%%PYTHON_SITELIBDIR%%/gruel/pmt/__init__.pyc -%%PYTHON_SITELIBDIR%%/gruel/pmt/__init__.pyo -%%PYTHON_SITELIBDIR%%/gruel/pmt/_pmt_swig.so -%%PYTHON_SITELIBDIR%%/gruel/pmt/pmt_swig.py -%%PYTHON_SITELIBDIR%%/gruel/pmt/pmt_swig.pyc -%%PYTHON_SITELIBDIR%%/gruel/pmt/pmt_swig.pyo -%%PYTHON_SITELIBDIR%%/gruel/pmt/pmt_to_python.py -%%PYTHON_SITELIBDIR%%/gruel/pmt/pmt_to_python.pyc -%%PYTHON_SITELIBDIR%%/gruel/pmt/pmt_to_python.pyo %%UHD%%%%PORTDOCS%%%%DOCSDIR%%/README.uhd %%UHD%%%%PYTHON_SITELIBDIR%%/gnuradio/uhd/__init__.py %%UHD%%%%PYTHON_SITELIBDIR%%/gnuradio/uhd/__init__.pyc @@ -786,10 +620,6 @@ %%UHD%%bin/uhd_rx_nogui %%UHD%%bin/uhd_siggen %%UHD%%bin/uhd_siggen_gui -%%UHD%%include/gnuradio/gr_uhd_amsg_source.h -%%UHD%%include/gnuradio/gr_uhd_api.h -%%UHD%%include/gnuradio/gr_uhd_usrp_sink.h -%%UHD%%include/gnuradio/gr_uhd_usrp_source.h %%UHD%%include/gnuradio/swig/uhd_swig.i %%UHD%%include/gnuradio/swig/uhd_swig_doc.i %%UHD%%lib/libgnuradio-uhd.so @@ -838,15 +668,6 @@ %%UHD%%share/gnuradio/grc/blocks/uhd_block_tree.xml %%UHD%%share/gnuradio/grc/blocks/uhd_usrp_sink.xml %%UHD%%share/gnuradio/grc/blocks/uhd_usrp_source.xml -@unexec if cmp -s %D/etc/gnuradio/conf.d/gnuradio-core.conf.sample %D/etc/gnuradio/conf.d/gnuradio-core.conf; then rm -f %D/etc/gnuradio/conf.d/gnuradio-core.conf; fi -@unexec if cmp -s %D/etc/gnuradio/conf.d/gr-audio-alsa.conf.sample %D/etc/gnuradio/conf.d/gr-audio-alsa.conf; then rm -f %D/etc/gnuradio/conf.d/gr-audio-alsa.conf; fi -@unexec if cmp -s %D/etc/gnuradio/conf.d/gr-audio-jack.conf.sample %D/etc/gnuradio/conf.d/gr-audio-jack.conf; then rm -f %D/etc/gnuradio/conf.d/gr-audio-jack.conf; fi -@unexec if cmp -s %D/etc/gnuradio/conf.d/gr-audio-oss.conf.sample %D/etc/gnuradio/conf.d/gr-audio-oss.conf; then rm -f %D/etc/gnuradio/conf.d/gr-audio-oss.conf; fi -@unexec if cmp -s %D/etc/gnuradio/conf.d/gr-audio-portaudio.conf.sample %D/etc/gnuradio/conf.d/gr-audio-portaudio.conf; then rm -f %D/etc/gnuradio/conf.d/gr-audio-portaudio.conf; fi -@unexec if cmp -s %D/etc/gnuradio/conf.d/gr-audio.conf.sample %D/etc/gnuradio/conf.d/gr-audio.conf; then rm -f %D/etc/gnuradio/conf.d/gr-audio.conf; fi -@unexec if cmp -s %D/etc/gnuradio/conf.d/gr-wxgui.conf.sample %D/etc/gnuradio/conf.d/gr-wxgui.conf; then rm -f %D/etc/gnuradio/conf.d/gr-wxgui.conf; fi -@unexec if cmp -s %D/etc/gnuradio/conf.d/grc.conf.sample %D/etc/gnuradio/conf.d/grc.conf; then rm -f %D/etc/gnuradio/conf.d/grc.conf; fi -@unexec if cmp -s %D/etc/gnuradio/conf.d/modtool.conf.sample %D/etc/gnuradio/conf.d/modtool.conf; then rm -f %D/etc/gnuradio/conf.d/modtool.conf; fi bin/gnuradio-companion bin/gnuradio-config-info bin/gr_filter_design @@ -870,20 +691,8 @@ bin/usrp_flex bin/usrp_flex_all bin/usrp_flex_band bin/volk_profile -etc/gnuradio/conf.d/gnuradio-core.conf.sample -etc/gnuradio/conf.d/gr-audio-alsa.conf.sample -etc/gnuradio/conf.d/gr-audio-jack.conf.sample -etc/gnuradio/conf.d/gr-audio-oss.conf.sample -etc/gnuradio/conf.d/gr-audio-portaudio.conf.sample -etc/gnuradio/conf.d/gr-audio.conf.sample etc/gnuradio/conf.d/gr-wxgui.conf.sample etc/gnuradio/conf.d/grc.conf.sample -etc/gnuradio/conf.d/modtool.conf.sample -include/gnuradio/ConstellationDisplayPlot.h -include/gnuradio/FrequencyDisplayPlot.h -include/gnuradio/SpectrumGUIClass.h -include/gnuradio/TimeDomainDisplayPlot.h -include/gnuradio/WaterfallDisplayPlot.h include/gnuradio/analog/agc.h include/gnuradio/analog/agc2.h include/gnuradio/analog/agc2_cc.h @@ -904,7 +713,6 @@ include/gnuradio/analog/noise_source_i.h include/gnuradio/analog/noise_source_s.h include/gnuradio/analog/noise_type.h include/gnuradio/analog/phase_modulator_fc.h -include/gnuradio/analog/plateau_detector_fb.h include/gnuradio/analog/pll_carriertracking_cc.h include/gnuradio/analog/pll_freqdet_cf.h include/gnuradio/analog/pll_refout_cc.h @@ -915,7 +723,6 @@ 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/rotator.h include/gnuradio/analog/sig_source_c.h include/gnuradio/analog/sig_source_f.h include/gnuradio/analog/sig_source_i.h @@ -923,54 +730,6 @@ include/gnuradio/analog/sig_source_s.h include/gnuradio/analog/sig_source_waveform.h include/gnuradio/analog/simple_squelch_cc.h include/gnuradio/analog/squelch_base_ff.h -include/gnuradio/atsc_api.h -include/gnuradio/atsc_bit_timing_loop.h -include/gnuradio/atsc_consts.h -include/gnuradio/atsc_deinterleaver.h -include/gnuradio/atsc_depad.h -include/gnuradio/atsc_derandomizer.h -include/gnuradio/atsc_ds_to_softds.h -include/gnuradio/atsc_equalizer.h -include/gnuradio/atsc_field_sync_demux.h -include/gnuradio/atsc_field_sync_mux.h -include/gnuradio/atsc_fpll.h -include/gnuradio/atsc_fs_checker.h -include/gnuradio/atsc_interleaver.h -include/gnuradio/atsc_pad.h -include/gnuradio/atsc_randomizer.h -include/gnuradio/atsc_rs_decoder.h -include/gnuradio/atsc_rs_encoder.h -include/gnuradio/atsc_trellis_encoder.h -include/gnuradio/atsc_types.h -include/gnuradio/atsc_viterbi_decoder.h -include/gnuradio/atsci_basic_trellis_encoder.h -include/gnuradio/atsci_data_interleaver.h -include/gnuradio/atsci_diag_output.h -include/gnuradio/atsci_equalizer.h -include/gnuradio/atsci_equalizer_lms.h -include/gnuradio/atsci_equalizer_lms2.h -include/gnuradio/atsci_equalizer_nop.h -include/gnuradio/atsci_exp2_lp.h -include/gnuradio/atsci_fake_single_viterbi.h -include/gnuradio/atsci_fs_checker.h -include/gnuradio/atsci_fs_checker_naive.h -include/gnuradio/atsci_fs_correlator.h -include/gnuradio/atsci_fs_correlator_naive.h -include/gnuradio/atsci_pnXXX.h -include/gnuradio/atsci_randomizer.h -include/gnuradio/atsci_reed_solomon.h -include/gnuradio/atsci_root_raised_cosine.h -include/gnuradio/atsci_root_raised_cosine_bandpass.h -include/gnuradio/atsci_single_viterbi.h -include/gnuradio/atsci_slicer_agc.h -include/gnuradio/atsci_sliding_correlator.h -include/gnuradio/atsci_sssr.h -include/gnuradio/atsci_syminfo.h -include/gnuradio/atsci_sync_tag.h -include/gnuradio/atsci_trellis_encoder.h -include/gnuradio/atsci_viterbi_decoder.h -include/gnuradio/atsci_vsbtx_lp.h -include/gnuradio/base.h include/gnuradio/blocks/add_cc.h include/gnuradio/blocks/add_const_cc.h include/gnuradio/blocks/add_const_ff.h @@ -1172,17 +931,6 @@ include/gnuradio/blocks/wavfile_source.h include/gnuradio/blocks/xor_bb.h include/gnuradio/blocks/xor_ii.h include/gnuradio/blocks/xor_ss.h -include/gnuradio/calc_metric.h -include/gnuradio/ccomplex_dotprod_generic.h -include/gnuradio/ccomplex_dotprod_x86.h -include/gnuradio/complex_dotprod_generic.h -include/gnuradio/complex_dotprod_x86.h -include/gnuradio/complex_vec_test.h -include/gnuradio/convolutional_interleaver.h -include/gnuradio/core_algorithms.h -include/gnuradio/create_atsci_equalizer.h -include/gnuradio/create_atsci_fs_checker.h -include/gnuradio/create_atsci_fs_correlator.h include/gnuradio/digital/api.h include/gnuradio/digital/header_payload_demux.h include/gnuradio/digital/ofdm_frame_equalizer_vcvc.h @@ -1191,70 +939,6 @@ include/gnuradio/digital/packet_header_d include/gnuradio/digital/packet_header_ofdm.h include/gnuradio/digital/packet_headergenerator_bb.h include/gnuradio/digital/packet_headerparser_b.h -include/gnuradio/digital_additive_scrambler_bb.h -include/gnuradio/digital_api.h -include/gnuradio/digital_binary_slicer_fb.h -include/gnuradio/digital_bytes_to_syms.h -include/gnuradio/digital_chunks_to_symbols_bc.h -include/gnuradio/digital_chunks_to_symbols_bf.h -include/gnuradio/digital_chunks_to_symbols_ic.h -include/gnuradio/digital_chunks_to_symbols_if.h -include/gnuradio/digital_chunks_to_symbols_sc.h -include/gnuradio/digital_chunks_to_symbols_sf.h -include/gnuradio/digital_clock_recovery_mm_cc.h -include/gnuradio/digital_clock_recovery_mm_ff.h -include/gnuradio/digital_cma_equalizer_cc.h -include/gnuradio/digital_constellation.h -include/gnuradio/digital_constellation_decoder_cb.h -include/gnuradio/digital_constellation_receiver_cb.h -include/gnuradio/digital_correlate_access_code_bb.h -include/gnuradio/digital_correlate_access_code_tag_bb.h -include/gnuradio/digital_costas_loop_cc.h -include/gnuradio/digital_cpmmod_bc.h -include/gnuradio/digital_crc32.h -include/gnuradio/digital_crc32_bb.h -include/gnuradio/digital_descrambler_bb.h -include/gnuradio/digital_diff_decoder_bb.h -include/gnuradio/digital_diff_encoder_bb.h -include/gnuradio/digital_diff_phasor_cc.h -include/gnuradio/digital_fll_band_edge_cc.h -include/gnuradio/digital_framer_sink_1.h -include/gnuradio/digital_glfsr_source_b.h -include/gnuradio/digital_glfsr_source_f.h -include/gnuradio/digital_gmskmod_bc.h -include/gnuradio/digital_impl_glfsr.h -include/gnuradio/digital_impl_mpsk_snr_est.h -include/gnuradio/digital_kurtotic_equalizer_cc.h -include/gnuradio/digital_lms_dd_equalizer_cc.h -include/gnuradio/digital_map_bb.h -include/gnuradio/digital_metric_type.h -include/gnuradio/digital_mpsk_receiver_cc.h -include/gnuradio/digital_mpsk_snr_est_cc.h -include/gnuradio/digital_ofdm_carrier_allocator_cvc.h -include/gnuradio/digital_ofdm_chanest_vcvc.h -include/gnuradio/digital_ofdm_cyclic_prefixer.h -include/gnuradio/digital_ofdm_equalizer_base.h -include/gnuradio/digital_ofdm_equalizer_simpledfe.h -include/gnuradio/digital_ofdm_equalizer_static.h -include/gnuradio/digital_ofdm_frame_acquisition.h -include/gnuradio/digital_ofdm_frame_sink.h -include/gnuradio/digital_ofdm_insert_preamble.h -include/gnuradio/digital_ofdm_mapper_bcv.h -include/gnuradio/digital_ofdm_sampler.h -include/gnuradio/digital_ofdm_sync_sc_cfb.h -include/gnuradio/digital_packet_sink.h -include/gnuradio/digital_pfb_clock_sync_ccf.h -include/gnuradio/digital_pfb_clock_sync_fff.h -include/gnuradio/digital_pn_correlator_cc.h -include/gnuradio/digital_probe_density_b.h -include/gnuradio/digital_probe_mpsk_snr_est_c.h -include/gnuradio/digital_scrambler_bb.h -include/gnuradio/digital_simple_correlator.h -include/gnuradio/digital_simple_framer.h -include/gnuradio/digital_simple_framer_sync.h -include/gnuradio/fcd_api.h -include/gnuradio/fcd_source_c.h -include/gnuradio/fcomplex_dotprod_x86.h include/gnuradio/fft/api.h include/gnuradio/fft/fft.h include/gnuradio/fft/fft_vcc.h @@ -1264,7 +948,6 @@ include/gnuradio/fft/goertzel_fc.h include/gnuradio/filter/adaptive_fir_ccc.h include/gnuradio/filter/adaptive_fir_ccf.h include/gnuradio/filter/api.h -include/gnuradio/filter/channel_model.h include/gnuradio/filter/dc_blocker_cc.h include/gnuradio/filter/dc_blocker_ff.h include/gnuradio/filter/fft_filter.h @@ -1319,495 +1002,9 @@ include/gnuradio/filter/rational_resampl include/gnuradio/filter/single_pole_iir.h include/gnuradio/filter/single_pole_iir_filter_cc.h include/gnuradio/filter/single_pole_iir_filter_ff.h -include/gnuradio/float_dotprod_generic.h -include/gnuradio/float_dotprod_x86.h -include/gnuradio/fpll_btloop_coupling.h -include/gnuradio/fsm.h -include/gnuradio/gnuradio_swig_bug_workaround.h -include/gnuradio/gr_adaptive_fir_ccc.h -include/gnuradio/gr_adaptive_fir_ccf.h -include/gnuradio/gr_add_cc.h -include/gnuradio/gr_add_const_bb.h -include/gnuradio/gr_add_const_cc.h -include/gnuradio/gr_add_const_ff.h -include/gnuradio/gr_add_const_ii.h -include/gnuradio/gr_add_const_sf.h -include/gnuradio/gr_add_const_ss.h -include/gnuradio/gr_add_const_vcc.h -include/gnuradio/gr_add_const_vff.h -include/gnuradio/gr_add_const_vii.h -include/gnuradio/gr_add_const_vss.h -include/gnuradio/gr_add_ff.h -include/gnuradio/gr_add_ii.h -include/gnuradio/gr_add_ss.h -include/gnuradio/gr_additive_scrambler_bb.h -include/gnuradio/gr_agc2_cc.h -include/gnuradio/gr_agc2_ff.h -include/gnuradio/gr_agc_cc.h -include/gnuradio/gr_agc_ff.h -include/gnuradio/gr_align_on_samplenumbers_ss.h -include/gnuradio/gr_altivec.h -include/gnuradio/gr_and_bb.h -include/gnuradio/gr_and_const_bb.h -include/gnuradio/gr_and_const_ii.h -include/gnuradio/gr_and_const_ss.h -include/gnuradio/gr_and_ii.h -include/gnuradio/gr_and_ss.h -include/gnuradio/gr_annotator_1to1.h -include/gnuradio/gr_annotator_alltoall.h -include/gnuradio/gr_annotator_raw.h -include/gnuradio/gr_argmax_fs.h -include/gnuradio/gr_argmax_is.h -include/gnuradio/gr_argmax_ss.h -include/gnuradio/gr_audio_api.h -include/gnuradio/gr_audio_sink.h -include/gnuradio/gr_audio_source.h -include/gnuradio/gr_basic_block.h *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403011432.s21EWdHj005636>