From owner-svn-ports-head@FreeBSD.ORG Wed Jun 12 13:04:31 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 95CDB262; Wed, 12 Jun 2013 13:04:31 +0000 (UTC) (envelope-from db@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 878461AB8; Wed, 12 Jun 2013 13:04:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5CD4VG6097161; Wed, 12 Jun 2013 13:04:31 GMT (envelope-from db@svn.freebsd.org) Received: (from db@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5CD4T10097147; Wed, 12 Jun 2013 13:04:29 GMT (envelope-from db@svn.freebsd.org) Message-Id: <201306121304.r5CD4T10097147@svn.freebsd.org> From: Diane Bruce Date: Wed, 12 Jun 2013 13:04:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r320680 - in head/comms/gnuradio: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Jun 2013 13:04:31 -0000 Author: db Date: Wed Jun 12 13:04:28 2013 New Revision: 320680 URL: http://svnweb.freebsd.org/changeset/ports/320680 Log: - Update to gnuradio 3.6.5 Important new features (3.6.5): New OFDM PHY layer (Martin Braun, Ben Reynwar) This release includes new OFDM PHY layer blocks in gr-digital. New runtime logging capability (Tom Rondeau) GNU Radio has a logging interface to enable various levels of logging information to be printed to the console or a file. And Numerous bug fixes Reviewed by: martymac Added: head/comms/gnuradio/files/patch-gr-uhd_CMakeLists.txt (contents, props changed) head/comms/gnuradio/files/patch-gr-utils_src_python_modtool_CMakeLists.txt (contents, props changed) head/comms/gnuradio/files/patch-gruel_src_lib_thread.cc (contents, props changed) Modified: head/comms/gnuradio/Makefile head/comms/gnuradio/distinfo head/comms/gnuradio/files/patch-CMakeLists.txt head/comms/gnuradio/files/patch-gnuradio-core_CMakeLists.txt head/comms/gnuradio/files/patch-gr-audio_lib_CMakeLists.txt head/comms/gnuradio/files/patch-gr-fcd_lib_CMakeLists.txt head/comms/gnuradio/files/patch-gr-wxgui_CMakeLists.txt head/comms/gnuradio/files/patch-grc_CMakeLists.txt head/comms/gnuradio/pkg-plist.dirs head/comms/gnuradio/pkg-plist.main Modified: head/comms/gnuradio/Makefile ============================================================================== --- head/comms/gnuradio/Makefile Wed Jun 12 13:00:55 2013 (r320679) +++ head/comms/gnuradio/Makefile Wed Jun 12 13:04:28 2013 (r320680) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= gnuradio -PORTVERSION= 3.6.3 +PORTVERSION= 3.6.5 CATEGORIES= comms astro hamradio MASTER_SITES= http://gnuradio.org/releases/gnuradio/ \ ${MASTER_SITE_LOCAL} @@ -10,28 +10,29 @@ MASTER_SITE_SUBDIR= db MAINTAINER= db@FreeBSD.org COMMENT= Amateur Radio Software defined radio -BUILD_DEPENDS= sdl-config:${PORTSDIR}/devel/sdl12\ - swig:${PORTSDIR}/devel/swig13\ - cheetah:${PORTSDIR}/devel/py-cheetah\ - ${LOCALBASE}/lib/portaudio2/libportaudio.so:${PORTSDIR}/audio/portaudio2 \ - py*-lxml>=0:${PORTSDIR}/devel/py-lxml\ - ${PYTHON_SITELIBDIR}/pygtk.py:${PORTSDIR}/x11-toolkits/py-gtk2\ - ${PYTHON_SITELIBDIR}/PyQt4/Qt.py:${PORTSDIR}/devel/py-qt4\ - xdg-open:${PORTSDIR}/devel/xdg-utils\ - guile:${PORTSDIR}/lang/guile\ - git:${PORTSDIR}/devel/git\ - jackd:${PORTSDIR}/audio/jack\ - aserver:${PORTSDIR}/audio/alsa-lib -LIB_DEPENDS= fftw3:${PORTSDIR}/math/fftw3\ - fftw3f:${PORTSDIR}/math/fftw3-float\ +BUILD_DEPENDS= sdl-config:${PORTSDIR}/devel/sdl12 \ + swig:${PORTSDIR}/devel/swig13 \ + cheetah:${PORTSDIR}/devel/py-cheetah \ + py*-lxml>=0:${PORTSDIR}/devel/py-lxml \ + ${PYTHON_SITELIBDIR}/pygtk.py:${PORTSDIR}/x11-toolkits/py-gtk2 \ + ${PYTHON_SITELIBDIR}/PyQt4/Qt.py:${PORTSDIR}/devel/py-qt4 \ + xdg-open:${PORTSDIR}/devel/xdg-utils \ + guile:${PORTSDIR}/lang/guile \ + git:${PORTSDIR}/devel/git +LIB_DEPENDS= fftw3:${PORTSDIR}/math/fftw3 \ + fftw3f:${PORTSDIR}/math/fftw3-float \ qwt:${PORTSDIR}/x11-toolkits/qwt5 \ boost_python:${PORTSDIR}/devel/boost-python-libs \ + portaudio.2:${PORTSDIR}/audio/portaudio2 \ + jack:${PORTSDIR}/audio/jack \ + asound:${PORTSDIR}/audio/alsa-lib \ gsl:${PORTSDIR}/math/gsl RUN_DEPENDS= ${PYNUMPY} \ ${PYTHON_SITELIBDIR}/ephem/__init__.py:${PORTSDIR}/astro/pyephem\ ${PYTHON_SITELIBDIR}/PyQt4/Qt.py:${PORTSDIR}/devel/py-qt4 USES= cmake:outsource +CMAKE_VERBOSE= yes DOCSDIR= share/doc/${PORTNAME}-${PORTVERSION} USE_PYTHON= 2.7+ USE_WX= 2.6+ @@ -46,18 +47,19 @@ OPTIONS_DEFAULT= USRP USRP_DESC= Include USRP support (UHD) from Ettus TESTING_DESC= Include testing support -.include - PLIST_SUB+= PORTVERSION=${PORTVERSION} +.include + .if ${PORT_OPTIONS:MDOCS} -USE_TEX= latex:build BUILD_DEPENDS+= doxygen:${PORTSDIR}/devel/doxygen \ ${LOCALBASE}/bin/sphinx-apidoc:${PORTSDIR}/textproc/py-sphinx \ dot:${PORTSDIR}/graphics/graphviz \ xmlto:${PORTSDIR}/textproc/xmlto \ - ${LOCALBASE}/lib/X11/fonts/freefont-ttf/fonts.scale:${PORTSDIR}/x11-fonts/freefont-ttf + ${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" HAVE_PORTDOCS= YES .else @@ -81,7 +83,6 @@ BUILD_DEPENDS+= cppunit-config:${PORTSDI CMAKE_ARGS+= -DENABLE_TESTING:STRING="OFF" .endif -.include post-patch: ${FIND} ${WRKSRC}/.. -name CMakeLists.txt | \ ${XARGS} ${REINPLACE_CMD} -e \ @@ -124,7 +125,7 @@ post-install: .if defined(HAVE_PORTDOCS) @${ECHO} gnuradio docs are in ${DOCSDIR} .endif - @${ECHO} conf files are in ${PREFIX}/etc/gnuradio/conf.d + @${ECHO} sample conf files are in ${PREFIX}/etc/gnuradio/conf.d @${ECHO} -.include +.include Modified: head/comms/gnuradio/distinfo ============================================================================== --- head/comms/gnuradio/distinfo Wed Jun 12 13:00:55 2013 (r320679) +++ head/comms/gnuradio/distinfo Wed Jun 12 13:04:28 2013 (r320680) @@ -1,2 +1,2 @@ -SHA256 (gnuradio-3.6.3.tar.gz) = bf4b2d7df2c078a6fccc0cf288d12bbb7617a9f86d453028db95f05e47745c9f -SIZE (gnuradio-3.6.3.tar.gz) = 2766447 +SHA256 (gnuradio-3.6.5.tar.gz) = fef4760758d5991ca43c0c5da25bcd2773165499a842638834842d19b07a0546 +SIZE (gnuradio-3.6.5.tar.gz) = 3142693 Modified: head/comms/gnuradio/files/patch-CMakeLists.txt ============================================================================== --- head/comms/gnuradio/files/patch-CMakeLists.txt Wed Jun 12 13:00:55 2013 (r320679) +++ head/comms/gnuradio/files/patch-CMakeLists.txt Wed Jun 12 13:04:28 2013 (r320680) @@ -1,18 +1,6 @@ ---- CMakeLists.txt.orig 2013-01-08 15:56:55.000000000 -0500 -+++ CMakeLists.txt 2013-03-12 11:12:02.000000000 -0500 -@@ -41,8 +41,9 @@ - # Set the version information here - set(VERSION_INFO_MAJOR_VERSION 3) - set(VERSION_INFO_API_COMPAT 6) --set(VERSION_INFO_MINOR_VERSION 4) --set(VERSION_INFO_MAINT_VERSION git) -+set(VERSION_INFO_MINOR_VERSION 3) -+#set(VERSION_INFO_MINOR_VERSION 4) -+set(VERSION_INFO_MAINT_VERSION 0) - include(GrVersion) #setup version info - - # Append -O2 optimization flag for Debug builds -@@ -103,6 +104,14 @@ +--- 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 @@ ######################################################################## include(GrPlatform) #define LIB_SUFFIX set(GR_RUNTIME_DIR bin) @@ -27,7 +15,7 @@ set(GR_LIBRARY_DIR lib${LIB_SUFFIX}) set(GR_INCLUDE_DIR include) set(GR_DATA_DIR share) -@@ -140,6 +149,22 @@ +@@ -151,6 +159,22 @@ ) ######################################################################## @@ -50,7 +38,7 @@ # Enable python component ######################################################################## find_package(PythonLibs) -@@ -221,12 +246,13 @@ +@@ -235,11 +259,13 @@ ######################################################################## # Distribute the README file ######################################################################## @@ -60,8 +48,7 @@ DESTINATION ${GR_PKG_DOC_DIR} COMPONENT "docs" ) -- -+endif(ENABLE_DOCS) ++endif() + ######################################################################## # The following dependency libraries are needed by all gr modules: - ######################################################################## Modified: head/comms/gnuradio/files/patch-gnuradio-core_CMakeLists.txt ============================================================================== --- head/comms/gnuradio/files/patch-gnuradio-core_CMakeLists.txt Wed Jun 12 13:00:55 2013 (r320679) +++ head/comms/gnuradio/files/patch-gnuradio-core_CMakeLists.txt Wed Jun 12 13:04:28 2013 (r320680) @@ -1,18 +1,24 @@ ---- gnuradio-core/CMakeLists.txt.orig 2013-01-08 15:56:55.000000000 -0500 -+++ gnuradio-core/CMakeLists.txt 2013-02-23 13:32:18.000000000 -0500 -@@ -107,6 +107,15 @@ - DEPENDS "gruel_swig;core_python;core_devel" - ) +--- gnuradio-core/CMakeLists.txt.orig 2013-05-01 18:57:50.000000000 -0500 ++++ gnuradio-core/CMakeLists.txt 2013-06-07 15:26:21.000000000 -0500 +@@ -118,11 +118,21 @@ + ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-core.conf + @ONLY) +# Install an original for FreeBSD +if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") + install( + FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-core.conf + DESTINATION ${GR_PREFSDIR} ++ RENAME "gnuradio-core.conf.sample" + COMPONENT "core_runtime" + ) ++elseif() +install( -+ FILES gnuradio-core.conf ++ FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-core.conf + DESTINATION ${GR_PREFSDIR} -+ RENAME "gnuradio-core.conf.sample" + COMPONENT "core_runtime" +) +endif() - install( - FILES gnuradio-core.conf - DESTINATION ${GR_PREFSDIR} + + if(ENABLE_GR_LOG AND HAVE_LOG4CPP) + install(FILES Modified: head/comms/gnuradio/files/patch-gr-audio_lib_CMakeLists.txt ============================================================================== --- head/comms/gnuradio/files/patch-gr-audio_lib_CMakeLists.txt Wed Jun 12 13:00:55 2013 (r320679) +++ head/comms/gnuradio/files/patch-gr-audio_lib_CMakeLists.txt Wed Jun 12 13:04:28 2013 (r320680) @@ -1,6 +1,6 @@ ---- gr-audio/lib/CMakeLists.txt.orig 2012-09-04 19:43:06.000000000 -0500 -+++ gr-audio/lib/CMakeLists.txt 2012-10-01 11:36:39.000000000 -0500 -@@ -116,8 +116,8 @@ +--- 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) if(PORTAUDIO_FOUND) @@ -11,7 +11,7 @@ list(APPEND gr_audio_libs ${PORTAUDIO_LIBRARIES}) add_definitions(${PORTAUDIO_DEFINITIONS}) list(APPEND gr_audio_sources -@@ -151,3 +151,10 @@ +@@ -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") @@ -21,4 +21,6 @@ + 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 Wed Jun 12 13:00:55 2013 (r320679) +++ head/comms/gnuradio/files/patch-gr-fcd_lib_CMakeLists.txt Wed Jun 12 13:04:28 2013 (r320680) @@ -1,14 +1,14 @@ ---- gr-fcd/lib/CMakeLists.txt.orig 2012-09-27 16:54:12.000000000 -0500 -+++ gr-fcd/lib/CMakeLists.txt 2012-09-27 17:09:46.000000000 -0500 -@@ -30,6 +30,7 @@ - ${CMAKE_CURRENT_SOURCE_DIR}/hid - ${CMAKE_CURRENT_SOURCE_DIR}/fcd +--- 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 +@@ -32,6 +32,7 @@ + ${GRUEL_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} ${LIBUSB_INCLUDE_DIR} + ${ICONV_INCLUDE_DIRS} ) - include_directories(${Boost_INCLUDE_DIRS}) -@@ -66,6 +67,10 @@ + link_directories(${Boost_LIBRARY_DIRS}) +@@ -82,6 +83,10 @@ if (LINUX) list(APPEND fcd_libs rt) endif() @@ -16,6 +16,6 @@ + message( "--- Adding iconv library for FreeBSD") + list(APPEND fcd_libs ${ICONV_LIBRARY}) +endif() - target_link_libraries(gnuradio-fcd ${fcd_libs}) + target_link_libraries(gnuradio-fcd ${fcd_libs} ${LOG4CPP_LIBRARIES}) Added: head/comms/gnuradio/files/patch-gr-uhd_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/gnuradio/files/patch-gr-uhd_CMakeLists.txt Wed Jun 12 13:04:28 2013 (r320680) @@ -0,0 +1,11 @@ +--- gr-uhd/CMakeLists.txt.orig 2013-06-04 17:35:10.000000000 -0500 ++++ gr-uhd/CMakeLists.txt 2013-06-04 17:35:23.000000000 -0500 +@@ -111,7 +111,7 @@ + + install( + FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-uhd.pc +- DESTINATION ${GR_LIBRARY_DIR}/pkgconfig ++ DESTINATION ${GR_PKGCONFIG_DIR}/pkgconfig + COMPONENT "uhd_devel" + ) + Added: head/comms/gnuradio/files/patch-gr-utils_src_python_modtool_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/gnuradio/files/patch-gr-utils_src_python_modtool_CMakeLists.txt Wed Jun 12 13:04:28 2013 (r320680) @@ -0,0 +1,22 @@ +--- gr-utils/src/python/modtool/CMakeLists.txt.orig 2013-05-01 18:57:50.000000000 -0500 ++++ gr-utils/src/python/modtool/CMakeLists.txt 2013-06-07 15:31:07.000000000 -0500 +@@ -54,9 +54,18 @@ + ${CMAKE_CURRENT_BINARY_DIR}/modtool.conf + @ONLY) + ++# FreeBSD needs an original copy ++if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") + install( + FILES ${CMAKE_CURRENT_BINARY_DIR}/modtool.conf + DESTINATION ${GR_PREFSDIR} ++ RENAME "modtool.conf.sample" + COMPONENT "utils" + ) +- ++elseif() ++install( ++ FILES ${CMAKE_CURRENT_BINARY_DIR}/modtool.conf ++ DESTINATION ${GR_PREFSDIR} ++ COMPONENT "utils" ++) ++endif() Modified: head/comms/gnuradio/files/patch-gr-wxgui_CMakeLists.txt ============================================================================== --- head/comms/gnuradio/files/patch-gr-wxgui_CMakeLists.txt Wed Jun 12 13:00:55 2013 (r320679) +++ head/comms/gnuradio/files/patch-gr-wxgui_CMakeLists.txt Wed Jun 12 13:04:28 2013 (r320680) @@ -1,18 +1,25 @@ ---- gr-wxgui/CMakeLists.txt.orig 2013-01-08 15:56:55.000000000 -0500 -+++ gr-wxgui/CMakeLists.txt 2013-03-14 07:31:59.000000000 -0500 -@@ -74,6 +74,15 @@ +--- 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 @@ ######################################################################## # Install the conf file ######################################################################## +# Install an original for FreeBSD +if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") + install( + FILES ${CMAKE_CURRENT_SOURCE_DIR}/gr-wxgui.conf + DESTINATION ${GR_PREFSDIR} ++ RENAME "gr-wxgui.conf.sample" + COMPONENT "wxgui" + ) +- ++elseif() +install( + FILES ${CMAKE_CURRENT_SOURCE_DIR}/gr-wxgui.conf + DESTINATION ${GR_PREFSDIR} -+ RENAME "gr-wxgui.conf.sample" + COMPONENT "wxgui" +) +endif() - install( - FILES ${CMAKE_CURRENT_SOURCE_DIR}/gr-wxgui.conf - DESTINATION ${GR_PREFSDIR} + ######################################################################## + # Add subdirectories + ######################################################################## Modified: head/comms/gnuradio/files/patch-grc_CMakeLists.txt ============================================================================== --- head/comms/gnuradio/files/patch-grc_CMakeLists.txt Wed Jun 12 13:00:55 2013 (r320679) +++ head/comms/gnuradio/files/patch-grc_CMakeLists.txt Wed Jun 12 13:04:28 2013 (r320680) @@ -1,18 +1,24 @@ ---- grc/CMakeLists.txt.orig 2012-09-04 19:43:06.000000000 -0500 -+++ grc/CMakeLists.txt 2012-10-01 11:39:07.000000000 -0500 -@@ -73,6 +73,15 @@ +--- grc/CMakeLists.txt.orig 2013-05-01 18:57:50.000000000 -0500 ++++ grc/CMakeLists.txt 2013-06-07 15:33:23.000000000 -0500 +@@ -73,11 +73,21 @@ ${CMAKE_CURRENT_BINARY_DIR}/grc.conf @ONLY) +# FreeBSD needs an original copy +if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") + install( + FILES ${CMAKE_CURRENT_BINARY_DIR}/grc.conf + DESTINATION ${GR_PREFSDIR} ++ RENAME "grc.conf.sample" + COMPONENT "grc" + ) ++elseif() +install( + FILES ${CMAKE_CURRENT_BINARY_DIR}/grc.conf + DESTINATION ${GR_PREFSDIR} -+ RENAME "grc.conf.sample" + COMPONENT "grc" +) +endif() - install( - FILES ${CMAKE_CURRENT_BINARY_DIR}/grc.conf - DESTINATION ${GR_PREFSDIR} + + GR_PYTHON_INSTALL( + FILES __init__.py Added: head/comms/gnuradio/files/patch-gruel_src_lib_thread.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/gnuradio/files/patch-gruel_src_lib_thread.cc Wed Jun 12 13:04:28 2013 (r320680) @@ -0,0 +1,11 @@ +--- gruel/src/lib/thread.cc.orig 2013-05-01 18:57:50.000000000 -0500 ++++ gruel/src/lib/thread.cc 2013-05-30 06:43:24.000000000 -0500 +@@ -95,7 +95,7 @@ + } + } /* namespace gruel */ + +-#elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) ++#elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) || defined(__FreeBSD__) + + namespace gruel { + Modified: head/comms/gnuradio/pkg-plist.dirs ============================================================================== --- head/comms/gnuradio/pkg-plist.dirs Wed Jun 12 13:00:55 2013 (r320679) +++ head/comms/gnuradio/pkg-plist.dirs Wed Jun 12 13:04:28 2013 (r320680) @@ -18,6 +18,7 @@ @dirrm %%PYTHON_SITELIBDIR%%/gnuradio/noaa @dirrm %%PYTHON_SITELIBDIR%%/gnuradio/pager @dirrm %%PYTHON_SITELIBDIR%%/gnuradio/qtgui +@dirrm %%PYTHON_SITELIBDIR%%/gnuradio/modtool %%UHD%%@dirrm %%PYTHON_SITELIBDIR%%/gnuradio/uhd @dirrm %%PYTHON_SITELIBDIR%%/gnuradio/vocoder @dirrm %%PYTHON_SITELIBDIR%%/gnuradio/wavelet @@ -34,6 +35,7 @@ @dirrmtry etc/gnuradio @dirrm include/gnuradio/analog @dirrm include/gnuradio/blocks +@dirrm include/gnuradio/digital @dirrm include/gnuradio/fft @dirrm include/gnuradio/filter @dirrm include/gnuradio/swig @@ -41,6 +43,8 @@ @dirrm include/gruel/swig @dirrm include/gruel @dirrm include/volk +@dirrm lib/cmake/gnuradio +@dirrmtry lib/cmake @dirrmtry libdata/pkgconfig @dirrm libexec/gnuradio @dirrm share/gnuradio/examples/atsc @@ -73,4 +77,20 @@ @dirrm share/gnuradio/grc/blocks @dirrm share/gnuradio/grc/freedesktop @dirrm share/gnuradio/grc +@dirrm share/gnuradio/modtool/gr-newmod/apps +@dirrm share/gnuradio/modtool/gr-newmod/cmake/Modules +@dirrm share/gnuradio/modtool/gr-newmod/cmake +@dirrm share/gnuradio/modtool/gr-newmod/include/howto +@dirrm share/gnuradio/modtool/gr-newmod/include +@dirrm share/gnuradio/modtool/gr-newmod/grc +@dirrm share/gnuradio/modtool/gr-newmod/python +@dirrm share/gnuradio/modtool/gr-newmod/lib +@dirrm share/gnuradio/modtool/gr-newmod/swig +@dirrm share/gnuradio/modtool/gr-newmod/docs/doxygen/doxyxml/generated +@dirrm share/gnuradio/modtool/gr-newmod/docs/doxygen/doxyxml +@dirrm share/gnuradio/modtool/gr-newmod/docs/doxygen/other +@dirrm share/gnuradio/modtool/gr-newmod/docs/doxygen +@dirrm share/gnuradio/modtool/gr-newmod/docs +@dirrm share/gnuradio/modtool/gr-newmod +@dirrm share/gnuradio/modtool @dirrm share/gnuradio Modified: head/comms/gnuradio/pkg-plist.main ============================================================================== --- head/comms/gnuradio/pkg-plist.main Wed Jun 12 13:00:55 2013 (r320679) +++ head/comms/gnuradio/pkg-plist.main Wed Jun 12 13:04:28 2013 (r320680) @@ -1,3 +1,14 @@ +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/README.analog +%%PORTDOCS%%%%DOCSDIR%%/README.audio +%%PORTDOCS%%%%DOCSDIR%%/README.blocks +%%PORTDOCS%%%%DOCSDIR%%/README.digital +%%PORTDOCS%%%%DOCSDIR%%/README.fcd +%%PORTDOCS%%%%DOCSDIR%%/README.fft +%%PORTDOCS%%%%DOCSDIR%%/README.filter +%%PORTDOCS%%%%DOCSDIR%%/README.hacking +%%PORTDOCS%%%%DOCSDIR%%/README.qtgui +%%PORTDOCS%%%%DOCSDIR%%/README.vocoder %%PYTHON_SITELIBDIR%%/gnuradio/__init__.py %%PYTHON_SITELIBDIR%%/gnuradio/__init__.pyc %%PYTHON_SITELIBDIR%%/gnuradio/__init__.pyo @@ -87,10 +98,21 @@ %%PYTHON_SITELIBDIR%%/gnuradio/blocks/__init__.py %%PYTHON_SITELIBDIR%%/gnuradio/blocks/__init__.pyc %%PYTHON_SITELIBDIR%%/gnuradio/blocks/__init__.pyo -%%PYTHON_SITELIBDIR%%/gnuradio/blocks/_blocks_swig.so +%%PYTHON_SITELIBDIR%%/gnuradio/blocks/_blocks_swig0.so +%%PYTHON_SITELIBDIR%%/gnuradio/blocks/_blocks_swig1.so +%%PYTHON_SITELIBDIR%%/gnuradio/blocks/_blocks_swig2.so %%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig.py %%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig.pyc %%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig.pyo +%%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig0.py +%%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig0.pyc +%%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig0.pyo +%%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig1.py +%%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig1.pyc +%%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig1.pyo +%%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig2.py +%%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig2.pyc +%%PYTHON_SITELIBDIR%%/gnuradio/blocks/blocks_swig2.pyo %%PYTHON_SITELIBDIR%%/gnuradio/blocks/parse_file_metadata.py %%PYTHON_SITELIBDIR%%/gnuradio/blocks/parse_file_metadata.pyc %%PYTHON_SITELIBDIR%%/gnuradio/blocks/parse_file_metadata.pyo @@ -143,6 +165,9 @@ %%PYTHON_SITELIBDIR%%/gnuradio/digital/ofdm_sync_pnac.py %%PYTHON_SITELIBDIR%%/gnuradio/digital/ofdm_sync_pnac.pyc %%PYTHON_SITELIBDIR%%/gnuradio/digital/ofdm_sync_pnac.pyo +%%PYTHON_SITELIBDIR%%/gnuradio/digital/ofdm_txrx.py +%%PYTHON_SITELIBDIR%%/gnuradio/digital/ofdm_txrx.pyc +%%PYTHON_SITELIBDIR%%/gnuradio/digital/ofdm_txrx.pyo %%PYTHON_SITELIBDIR%%/gnuradio/digital/packet_utils.py %%PYTHON_SITELIBDIR%%/gnuradio/digital/packet_utils.pyc %%PYTHON_SITELIBDIR%%/gnuradio/digital/packet_utils.pyo @@ -155,6 +180,9 @@ %%PYTHON_SITELIBDIR%%/gnuradio/digital/qam.py %%PYTHON_SITELIBDIR%%/gnuradio/digital/qam.pyc %%PYTHON_SITELIBDIR%%/gnuradio/digital/qam.pyo +%%PYTHON_SITELIBDIR%%/gnuradio/digital/qamlike.py +%%PYTHON_SITELIBDIR%%/gnuradio/digital/qamlike.pyc +%%PYTHON_SITELIBDIR%%/gnuradio/digital/qamlike.pyo %%PYTHON_SITELIBDIR%%/gnuradio/digital/qpsk.py %%PYTHON_SITELIBDIR%%/gnuradio/digital/qpsk.pyc %%PYTHON_SITELIBDIR%%/gnuradio/digital/qpsk.pyo @@ -170,6 +198,9 @@ %%PYTHON_SITELIBDIR%%/gnuradio/digital/utils/mod_codes.py %%PYTHON_SITELIBDIR%%/gnuradio/digital/utils/mod_codes.pyc %%PYTHON_SITELIBDIR%%/gnuradio/digital/utils/mod_codes.pyo +%%PYTHON_SITELIBDIR%%/gnuradio/digital/utils/tagged_streams.py +%%PYTHON_SITELIBDIR%%/gnuradio/digital/utils/tagged_streams.pyc +%%PYTHON_SITELIBDIR%%/gnuradio/digital/utils/tagged_streams.pyo %%PYTHON_SITELIBDIR%%/gnuradio/eng_notation.py %%PYTHON_SITELIBDIR%%/gnuradio/eng_notation.pyc %%PYTHON_SITELIBDIR%%/gnuradio/eng_notation.pyo @@ -260,6 +291,9 @@ %%PYTHON_SITELIBDIR%%/gnuradio/gr/pubsub.py %%PYTHON_SITELIBDIR%%/gnuradio/gr/pubsub.pyc %%PYTHON_SITELIBDIR%%/gnuradio/gr/pubsub.pyo +%%PYTHON_SITELIBDIR%%/gnuradio/gr/tag_utils.py +%%PYTHON_SITELIBDIR%%/gnuradio/gr/tag_utils.pyc +%%PYTHON_SITELIBDIR%%/gnuradio/gr/tag_utils.pyo %%PYTHON_SITELIBDIR%%/gnuradio/gr/top_block.py %%PYTHON_SITELIBDIR%%/gnuradio/gr/top_block.pyc %%PYTHON_SITELIBDIR%%/gnuradio/gr/top_block.pyo @@ -460,6 +494,51 @@ %%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 +%%PYTHON_SITELIBDIR%%/gnuradio/modtool/cmakefile_editor.py +%%PYTHON_SITELIBDIR%%/gnuradio/modtool/cmakefile_editor.pyc +%%PYTHON_SITELIBDIR%%/gnuradio/modtool/cmakefile_editor.pyo +%%PYTHON_SITELIBDIR%%/gnuradio/modtool/code_generator.py +%%PYTHON_SITELIBDIR%%/gnuradio/modtool/code_generator.pyc +%%PYTHON_SITELIBDIR%%/gnuradio/modtool/code_generator.pyo +%%PYTHON_SITELIBDIR%%/gnuradio/modtool/grc_xml_generator.py +%%PYTHON_SITELIBDIR%%/gnuradio/modtool/grc_xml_generator.pyc +%%PYTHON_SITELIBDIR%%/gnuradio/modtool/grc_xml_generator.pyo +%%PYTHON_SITELIBDIR%%/gnuradio/modtool/modtool_add.py +%%PYTHON_SITELIBDIR%%/gnuradio/modtool/modtool_add.pyc +%%PYTHON_SITELIBDIR%%/gnuradio/modtool/modtool_add.pyo +%%PYTHON_SITELIBDIR%%/gnuradio/modtool/modtool_base.py +%%PYTHON_SITELIBDIR%%/gnuradio/modtool/modtool_base.pyc +%%PYTHON_SITELIBDIR%%/gnuradio/modtool/modtool_base.pyo +%%PYTHON_SITELIBDIR%%/gnuradio/modtool/modtool_disable.py +%%PYTHON_SITELIBDIR%%/gnuradio/modtool/modtool_disable.pyc +%%PYTHON_SITELIBDIR%%/gnuradio/modtool/modtool_disable.pyo +%%PYTHON_SITELIBDIR%%/gnuradio/modtool/modtool_help.py +%%PYTHON_SITELIBDIR%%/gnuradio/modtool/modtool_help.pyc +%%PYTHON_SITELIBDIR%%/gnuradio/modtool/modtool_help.pyo +%%PYTHON_SITELIBDIR%%/gnuradio/modtool/modtool_info.py +%%PYTHON_SITELIBDIR%%/gnuradio/modtool/modtool_info.pyc +%%PYTHON_SITELIBDIR%%/gnuradio/modtool/modtool_info.pyo +%%PYTHON_SITELIBDIR%%/gnuradio/modtool/modtool_makexml.py +%%PYTHON_SITELIBDIR%%/gnuradio/modtool/modtool_makexml.pyc +%%PYTHON_SITELIBDIR%%/gnuradio/modtool/modtool_makexml.pyo +%%PYTHON_SITELIBDIR%%/gnuradio/modtool/modtool_newmod.py +%%PYTHON_SITELIBDIR%%/gnuradio/modtool/modtool_newmod.pyc +%%PYTHON_SITELIBDIR%%/gnuradio/modtool/modtool_newmod.pyo +%%PYTHON_SITELIBDIR%%/gnuradio/modtool/modtool_rm.py +%%PYTHON_SITELIBDIR%%/gnuradio/modtool/modtool_rm.pyc +%%PYTHON_SITELIBDIR%%/gnuradio/modtool/modtool_rm.pyo +%%PYTHON_SITELIBDIR%%/gnuradio/modtool/parser_cc_block.py +%%PYTHON_SITELIBDIR%%/gnuradio/modtool/parser_cc_block.pyc +%%PYTHON_SITELIBDIR%%/gnuradio/modtool/parser_cc_block.pyo +%%PYTHON_SITELIBDIR%%/gnuradio/modtool/templates.py +%%PYTHON_SITELIBDIR%%/gnuradio/modtool/templates.pyc +%%PYTHON_SITELIBDIR%%/gnuradio/modtool/templates.pyo +%%PYTHON_SITELIBDIR%%/gnuradio/modtool/util_functions.py +%%PYTHON_SITELIBDIR%%/gnuradio/modtool/util_functions.pyc +%%PYTHON_SITELIBDIR%%/gnuradio/modtool/util_functions.pyo %%PYTHON_SITELIBDIR%%/gnuradio/noaa/__init__.py %%PYTHON_SITELIBDIR%%/gnuradio/noaa/__init__.pyc %%PYTHON_SITELIBDIR%%/gnuradio/noaa/__init__.pyo @@ -688,6 +767,10 @@ %%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 %%UHD%%%%PYTHON_SITELIBDIR%%/gnuradio/uhd/__init__.pyo @@ -763,10 +846,11 @@ @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 -bin/create-gnuradio-out-of-tree-project +@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 +bin/gr_modtool bin/gr_plot_char bin/gr_plot_const bin/gr_plot_fft @@ -794,6 +878,7 @@ etc/gnuradio/conf.d/gr-audio-portaudio.c 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 @@ -813,7 +898,13 @@ include/gnuradio/analog/dpll_bb.h include/gnuradio/analog/feedforward_agc_cc.h include/gnuradio/analog/fmdet_cf.h include/gnuradio/analog/frequency_modulator_fc.h +include/gnuradio/analog/noise_source_c.h +include/gnuradio/analog/noise_source_f.h +include/gnuradio/analog/noise_source_i.h +include/gnuradio/analog/noise_source_s.h +include/gnuradio/analog/noise_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 @@ -825,6 +916,10 @@ 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 +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 @@ -894,9 +989,18 @@ include/gnuradio/blocks/and_const_ii.h include/gnuradio/blocks/and_const_ss.h include/gnuradio/blocks/and_ii.h include/gnuradio/blocks/and_ss.h +include/gnuradio/blocks/annotator_1to1.h +include/gnuradio/blocks/annotator_alltoall.h +include/gnuradio/blocks/annotator_raw.h include/gnuradio/blocks/api.h +include/gnuradio/blocks/argmax_fs.h +include/gnuradio/blocks/argmax_is.h +include/gnuradio/blocks/argmax_ss.h +include/gnuradio/blocks/bin_statistics_f.h +include/gnuradio/blocks/burst_tagger.h include/gnuradio/blocks/char_to_float.h include/gnuradio/blocks/char_to_short.h +include/gnuradio/blocks/check_lfsr_32k_s.h include/gnuradio/blocks/complex_to_arg.h include/gnuradio/blocks/complex_to_float.h include/gnuradio/blocks/complex_to_imag.h @@ -905,19 +1009,29 @@ include/gnuradio/blocks/complex_to_mag.h include/gnuradio/blocks/complex_to_mag_squared.h include/gnuradio/blocks/complex_to_real.h include/gnuradio/blocks/conjugate_cc.h +include/gnuradio/blocks/control_loop.h +include/gnuradio/blocks/copy.h +include/gnuradio/blocks/count_bits.h include/gnuradio/blocks/deinterleave.h +include/gnuradio/blocks/delay.h include/gnuradio/blocks/divide_cc.h include/gnuradio/blocks/divide_ff.h include/gnuradio/blocks/divide_ii.h include/gnuradio/blocks/divide_ss.h +include/gnuradio/blocks/endian_swap.h +include/gnuradio/blocks/file_descriptor_sink.h +include/gnuradio/blocks/file_descriptor_source.h include/gnuradio/blocks/file_meta_sink.h include/gnuradio/blocks/file_meta_source.h +include/gnuradio/blocks/file_sink.h +include/gnuradio/blocks/file_sink_base.h include/gnuradio/blocks/file_source.h include/gnuradio/blocks/float_to_char.h include/gnuradio/blocks/float_to_complex.h include/gnuradio/blocks/float_to_int.h include/gnuradio/blocks/float_to_short.h include/gnuradio/blocks/float_to_uchar.h +include/gnuradio/blocks/head.h include/gnuradio/blocks/int_to_float.h include/gnuradio/blocks/integrate_cc.h include/gnuradio/blocks/integrate_ff.h @@ -927,6 +1041,22 @@ include/gnuradio/blocks/interleave.h include/gnuradio/blocks/interleaved_short_to_complex.h include/gnuradio/blocks/keep_m_in_n.h include/gnuradio/blocks/keep_one_in_n.h +include/gnuradio/blocks/lfsr_15_1_0.h +include/gnuradio/blocks/lfsr_32k.h +include/gnuradio/blocks/lfsr_32k_source_s.h +include/gnuradio/blocks/log2_const.h +include/gnuradio/blocks/max_ff.h +include/gnuradio/blocks/max_ii.h +include/gnuradio/blocks/max_ss.h +include/gnuradio/blocks/message_burst_source.h +include/gnuradio/blocks/message_debug.h +include/gnuradio/blocks/message_sink.h +include/gnuradio/blocks/message_source.h +include/gnuradio/blocks/message_strobe.h +include/gnuradio/blocks/moving_average_cc.h +include/gnuradio/blocks/moving_average_ff.h +include/gnuradio/blocks/moving_average_ii.h +include/gnuradio/blocks/moving_average_ss.h include/gnuradio/blocks/multiply_cc.h include/gnuradio/blocks/multiply_conjugate_cc.h include/gnuradio/blocks/multiply_const_cc.h @@ -940,29 +1070,105 @@ include/gnuradio/blocks/multiply_const_v include/gnuradio/blocks/multiply_ff.h include/gnuradio/blocks/multiply_ii.h include/gnuradio/blocks/multiply_ss.h +include/gnuradio/blocks/mute_cc.h +include/gnuradio/blocks/mute_ff.h +include/gnuradio/blocks/mute_ii.h +include/gnuradio/blocks/mute_ss.h include/gnuradio/blocks/nlog10_ff.h +include/gnuradio/blocks/nop.h include/gnuradio/blocks/not_bb.h include/gnuradio/blocks/not_ii.h include/gnuradio/blocks/not_ss.h +include/gnuradio/blocks/null_sink.h +include/gnuradio/blocks/null_source.h include/gnuradio/blocks/or_bb.h include/gnuradio/blocks/or_ii.h include/gnuradio/blocks/or_ss.h +include/gnuradio/blocks/pack_k_bits_bb.h +include/gnuradio/blocks/packed_to_unpacked_bb.h +include/gnuradio/blocks/packed_to_unpacked_ii.h +include/gnuradio/blocks/packed_to_unpacked_ss.h include/gnuradio/blocks/patterned_interleaver.h +include/gnuradio/blocks/pdu.h +include/gnuradio/blocks/pdu_to_tagged_stream.h +include/gnuradio/blocks/peak_detector2_fb.h +include/gnuradio/blocks/peak_detector_fb.h +include/gnuradio/blocks/peak_detector_ib.h +include/gnuradio/blocks/peak_detector_sb.h +include/gnuradio/blocks/plateau_detector_fb.h +include/gnuradio/blocks/probe_rate.h +include/gnuradio/blocks/probe_signal_b.h +include/gnuradio/blocks/probe_signal_c.h +include/gnuradio/blocks/probe_signal_f.h +include/gnuradio/blocks/probe_signal_i.h +include/gnuradio/blocks/probe_signal_s.h +include/gnuradio/blocks/probe_signal_vb.h +include/gnuradio/blocks/probe_signal_vc.h +include/gnuradio/blocks/probe_signal_vf.h +include/gnuradio/blocks/probe_signal_vi.h +include/gnuradio/blocks/probe_signal_vs.h +include/gnuradio/blocks/regenerate_bb.h +include/gnuradio/blocks/repack_bits_bb.h include/gnuradio/blocks/repeat.h +include/gnuradio/blocks/rms_cf.h +include/gnuradio/blocks/rms_ff.h +include/gnuradio/blocks/rotator.h +include/gnuradio/blocks/sample_and_hold_bb.h +include/gnuradio/blocks/sample_and_hold_ff.h +include/gnuradio/blocks/sample_and_hold_ii.h +include/gnuradio/blocks/sample_and_hold_ss.h include/gnuradio/blocks/short_to_char.h include/gnuradio/blocks/short_to_float.h +include/gnuradio/blocks/skiphead.h +include/gnuradio/blocks/socket_pdu.h include/gnuradio/blocks/stream_mux.h include/gnuradio/blocks/stream_to_streams.h include/gnuradio/blocks/stream_to_vector.h include/gnuradio/blocks/streams_to_stream.h include/gnuradio/blocks/streams_to_vector.h +include/gnuradio/blocks/stretch_ff.h include/gnuradio/blocks/sub_cc.h include/gnuradio/blocks/sub_ff.h include/gnuradio/blocks/sub_ii.h include/gnuradio/blocks/sub_ss.h +include/gnuradio/blocks/tag_debug.h +include/gnuradio/blocks/tag_gate.h +include/gnuradio/blocks/tagged_file_sink.h +include/gnuradio/blocks/tagged_stream_mux.h +include/gnuradio/blocks/tagged_stream_to_pdu.h +include/gnuradio/blocks/threshold_ff.h +include/gnuradio/blocks/throttle.h +include/gnuradio/blocks/transcendental.h +include/gnuradio/blocks/tuntap_pdu.h include/gnuradio/blocks/uchar_to_float.h +include/gnuradio/blocks/udp_sink.h +include/gnuradio/blocks/udp_source.h +include/gnuradio/blocks/unpack_k_bits_bb.h +include/gnuradio/blocks/unpacked_to_packed_bb.h +include/gnuradio/blocks/unpacked_to_packed_ii.h +include/gnuradio/blocks/unpacked_to_packed_ss.h +include/gnuradio/blocks/vco_f.h +include/gnuradio/blocks/vector_insert_b.h +include/gnuradio/blocks/vector_insert_c.h +include/gnuradio/blocks/vector_insert_f.h +include/gnuradio/blocks/vector_insert_i.h +include/gnuradio/blocks/vector_insert_s.h +include/gnuradio/blocks/vector_map.h +include/gnuradio/blocks/vector_sink_b.h +include/gnuradio/blocks/vector_sink_c.h +include/gnuradio/blocks/vector_sink_f.h +include/gnuradio/blocks/vector_sink_i.h +include/gnuradio/blocks/vector_sink_s.h +include/gnuradio/blocks/vector_source_b.h +include/gnuradio/blocks/vector_source_c.h +include/gnuradio/blocks/vector_source_f.h +include/gnuradio/blocks/vector_source_i.h +include/gnuradio/blocks/vector_source_s.h include/gnuradio/blocks/vector_to_stream.h include/gnuradio/blocks/vector_to_streams.h +include/gnuradio/blocks/wavfile.h +include/gnuradio/blocks/wavfile_sink.h +include/gnuradio/blocks/wavfile_source.h include/gnuradio/blocks/xor_bb.h include/gnuradio/blocks/xor_ii.h include/gnuradio/blocks/xor_ss.h @@ -977,6 +1183,14 @@ 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 +include/gnuradio/digital/ofdm_serializer_vcc.h +include/gnuradio/digital/packet_header_default.h +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 @@ -998,6 +1212,7 @@ include/gnuradio/digital_correlate_acces 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 @@ -1015,12 +1230,18 @@ 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 @@ -1028,6 +1249,7 @@ include/gnuradio/digital_pn_correlator_c 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 @@ -1060,6 +1282,8 @@ include/gnuradio/filter/fir_filter_with_ include/gnuradio/filter/firdes.h include/gnuradio/filter/fractional_interpolator_cc.h include/gnuradio/filter/fractional_interpolator_ff.h +include/gnuradio/filter/fractional_resampler_cc.h +include/gnuradio/filter/fractional_resampler_ff.h include/gnuradio/filter/freq_xlating_fir_filter_ccc.h include/gnuradio/filter/freq_xlating_fir_filter_ccf.h include/gnuradio/filter/freq_xlating_fir_filter_fcc.h @@ -1163,6 +1387,7 @@ include/gnuradio/gr_circular_file.h include/gnuradio/gr_complex.h include/gnuradio/gr_complex_to_interleaved_short.h include/gnuradio/gr_complex_to_xxx.h +include/gnuradio/gr_config.h include/gnuradio/gr_conjugate_cc.h include/gnuradio/gr_constants.h include/gnuradio/gr_copy.h @@ -1194,6 +1419,10 @@ include/gnuradio/gr_endianness.h include/gnuradio/gr_error_handler.h include/gnuradio/gr_expj.h include/gnuradio/gr_fake_channel_coder_pp.h +include/gnuradio/gr_fastnoise_source_c.h +include/gnuradio/gr_fastnoise_source_f.h +include/gnuradio/gr_fastnoise_source_i.h +include/gnuradio/gr_fastnoise_source_s.h include/gnuradio/gr_feedforward_agc_cc.h include/gnuradio/gr_feval.h include/gnuradio/gr_fft_filter_ccc.h @@ -1282,6 +1511,7 @@ include/gnuradio/gr_kludge_copy.h include/gnuradio/gr_lfsr_32k_source_s.h include/gnuradio/gr_local_sighandler.h include/gnuradio/gr_log2_const.h +include/gnuradio/gr_logger.h include/gnuradio/gr_map_bb.h include/gnuradio/gr_math.h include/gnuradio/gr_max_ff.h @@ -1385,6 +1615,7 @@ include/gnuradio/gr_qtgui_api.h include/gnuradio/gr_quadrature_demod_cf.h include/gnuradio/gr_rail_ff.h include/gnuradio/gr_random.h +include/gnuradio/gr_random_pdu.h include/gnuradio/gr_rational_resampler_base_ccc.h include/gnuradio/gr_rational_resampler_base_ccf.h include/gnuradio/gr_rational_resampler_base_fcc.h @@ -1447,6 +1678,7 @@ include/gnuradio/gr_sync_interpolator.h include/gnuradio/gr_sys_paths.h include/gnuradio/gr_tag_debug.h include/gnuradio/gr_tagged_file_sink.h +include/gnuradio/gr_tagged_stream_block.h include/gnuradio/gr_tagged_stream_to_pdu.h include/gnuradio/gr_tags.h include/gnuradio/gr_test.h @@ -1579,8 +1811,12 @@ include/gnuradio/swig/atsc.i include/gnuradio/swig/atsc_swig_doc.i include/gnuradio/swig/audio_swig.i include/gnuradio/swig/audio_swig_doc.i -include/gnuradio/swig/blocks_swig.i -include/gnuradio/swig/blocks_swig_doc.i +include/gnuradio/swig/blocks_swig0.i +include/gnuradio/swig/blocks_swig0_doc.i +include/gnuradio/swig/blocks_swig1.i +include/gnuradio/swig/blocks_swig1_doc.i +include/gnuradio/swig/blocks_swig2.i +include/gnuradio/swig/blocks_swig2_doc.i include/gnuradio/swig/complex_vec_test.i include/gnuradio/swig/digital_additive_scrambler_bb.i include/gnuradio/swig/digital_binary_slicer_fb.i @@ -1630,6 +1866,7 @@ include/gnuradio/swig/digital_pn_correla include/gnuradio/swig/digital_probe_density_b.i include/gnuradio/swig/digital_probe_mpsk_snr_est_c.i include/gnuradio/swig/digital_scrambler_bb.i +include/gnuradio/swig/digital_simple_correlator.i include/gnuradio/swig/digital_simple_framer.i include/gnuradio/swig/digital_swig.i include/gnuradio/swig/digital_swig_doc.i @@ -1736,6 +1973,10 @@ include/gnuradio/swig/gr_endian_swap.i include/gnuradio/swig/gr_endianness.i include/gnuradio/swig/gr_error_handler.i include/gnuradio/swig/gr_fake_channel_coder_pp.i +include/gnuradio/swig/gr_fastnoise_source_c.i +include/gnuradio/swig/gr_fastnoise_source_f.i +include/gnuradio/swig/gr_fastnoise_source_i.i +include/gnuradio/swig/gr_fastnoise_source_s.i include/gnuradio/swig/gr_feedforward_agc_cc.i include/gnuradio/swig/gr_feval.i include/gnuradio/swig/gr_fft_filter_ccc.i @@ -1799,6 +2040,7 @@ include/gnuradio/swig/gr_keep_m_in_n.i include/gnuradio/swig/gr_keep_one_in_n.i include/gnuradio/swig/gr_kludge_copy.i include/gnuradio/swig/gr_lfsr_32k_source_s.i +include/gnuradio/swig/gr_logger.i include/gnuradio/swig/gr_map_bb.i include/gnuradio/swig/gr_max_ff.i include/gnuradio/swig/gr_max_ii.i @@ -1890,6 +2132,7 @@ include/gnuradio/swig/gr_pwr_squelch_cc. include/gnuradio/swig/gr_pwr_squelch_ff.i include/gnuradio/swig/gr_quadrature_demod_cf.i include/gnuradio/swig/gr_rail_ff.i +include/gnuradio/swig/gr_random_pdu.i include/gnuradio/swig/gr_rational_resampler_base_ccc.i include/gnuradio/swig/gr_rational_resampler_base_ccf.i include/gnuradio/swig/gr_rational_resampler_base_fcc.i @@ -1940,6 +2183,7 @@ include/gnuradio/swig/gr_sync_decimator. include/gnuradio/swig/gr_sync_interpolator.i include/gnuradio/swig/gr_tag_debug.i include/gnuradio/swig/gr_tagged_file_sink.i +include/gnuradio/swig/gr_tagged_stream_block.i include/gnuradio/swig/gr_tagged_stream_to_pdu.i include/gnuradio/swig/gr_tags.i include/gnuradio/swig/gr_test.i @@ -2320,6 +2564,8 @@ include/volk/volk_config_fixed.h include/volk/volk_cpu.h include/volk/volk_prefs.h include/volk/volk_typedefs.h +lib/cmake/gnuradio/GnuradioConfig.cmake +lib/cmake/gnuradio/GnuradioConfigVersion.cmake lib/libgnuradio-analog.so lib/libgnuradio-analog.so.%%MAJOR_VERSION%% lib/libgnuradio-analog.so.%%PORTVERSION%% @@ -2374,9 +2620,9 @@ lib/libgruel.so.%%PORTVERSION%% lib/libvolk.so lib/libvolk.so.0.0.0 libdata/pkgconfig/gnuradio-analog.pc -libdata/pkgconfig/gnuradio-blocks.pc libdata/pkgconfig/gnuradio-atsc.pc libdata/pkgconfig/gnuradio-audio.pc +libdata/pkgconfig/gnuradio-blocks.pc libdata/pkgconfig/gnuradio-core.pc libdata/pkgconfig/gnuradio-digital.pc libdata/pkgconfig/gnuradio-fcd.pc @@ -2473,6 +2719,7 @@ share/gnuradio/examples/metadata/file_me share/gnuradio/examples/metadata/file_metadata_vector_sink.grc share/gnuradio/examples/metadata/file_metadata_vector_source.grc share/gnuradio/examples/mp-sched/README +share/gnuradio/examples/mp-sched/affinity_set.py share/gnuradio/examples/mp-sched/plot_flops.py share/gnuradio/examples/mp-sched/run_synthetic.py share/gnuradio/examples/mp-sched/synthetic.py @@ -2561,6 +2808,7 @@ share/gnuradio/grc/blocks/analog_feedfor share/gnuradio/grc/blocks/analog_frequency_modulator_fc.xml share/gnuradio/grc/blocks/analog_noise_source_x.xml share/gnuradio/grc/blocks/analog_phase_modulator_fc.xml +share/gnuradio/grc/blocks/analog_plateau_detector_fb.xml share/gnuradio/grc/blocks/analog_pll_carriertracking_cc.xml share/gnuradio/grc/blocks/analog_pll_freqdet_cf.xml share/gnuradio/grc/blocks/analog_pll_refout_cc.xml @@ -2603,7 +2851,9 @@ share/gnuradio/grc/blocks/blocks_add_con share/gnuradio/grc/blocks/blocks_add_xx.xml share/gnuradio/grc/blocks/blocks_and_const_xx.xml share/gnuradio/grc/blocks/blocks_and_xx.xml +share/gnuradio/grc/blocks/blocks_argmax_xx.xml share/gnuradio/grc/blocks/blocks_block_tree.xml +share/gnuradio/grc/blocks/blocks_burst_tagger.xml share/gnuradio/grc/blocks/blocks_char_to_float.xml share/gnuradio/grc/blocks/blocks_char_to_short.xml share/gnuradio/grc/blocks/blocks_complex_to_arg.xml @@ -2614,41 +2864,94 @@ share/gnuradio/grc/blocks/blocks_complex share/gnuradio/grc/blocks/blocks_complex_to_mag_squared.xml share/gnuradio/grc/blocks/blocks_complex_to_real.xml *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***