1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-27 10:03:20 +00:00

Release 3.6.3 is a significant release, adding major new

capabilities and many bug fixes, while maintaining strict source
compatibility with user code already written for the 3.6 API.

Much of the code was the result of two events, the September 2012 GNU
Radio conference in Atlanta, GA, and the November 2012 GNU Radio
hackfest held at Ettus Research in Mountain View, CA. Additional work
(not discussed here) from these events has been incorporated into the
'next' branch of the code repository, and will become part of the 3.7
API release series.

New features include asynchronous message passing between blocks, new
blocks for interfacing with operating system networking stacks, the
ability to write new signal processing blocks in Python, enhanced file
source and sinks that can store metadata, flowgraph latency control,
improvements to documentation, and further conversion of existing code
into the 3.7 API organization (while leaving existing blocks in
place.)

The detailed changelog is here:

http://gnuradio.org/redmine/projects/gnuradio/wiki/ChangeLogV3_6_3
This commit is contained in:
Diane Bruce 2013-04-29 13:57:24 +00:00
parent dddd7142fb
commit 6773ec9191
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=316814
39 changed files with 3178 additions and 13646 deletions

View File

@ -1,10 +1,11 @@
# $FreeBSD$
PORTNAME= gnuradio
PORTVERSION= 3.6.2
PORTREVISION= 2
PORTVERSION= 3.6.3
CATEGORIES= comms astro hamradio
MASTER_SITES= http://gnuradio.org/releases/gnuradio/
MASTER_SITES= http://gnuradio.org/releases/gnuradio/ \
${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= db
MAINTAINER= db@FreeBSD.org
COMMENT= Amateur Radio Software defined radio
@ -32,29 +33,25 @@ RUN_DEPENDS= ${PYNUMPY} \
USES= cmake:outsource
DOCSDIR= share/doc/${PORTNAME}-${PORTVERSION}
#CMAKE_ARGS= --debug-output --trace
CMAKE_ARGS=+ --debug-output
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
USE_PERL5= yes
USE_LDCONFIG= yes
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 800069
LIB_DEPENDS+= usb:${PORTSDIR}/devel/libusb
.endif
PLIST_SUB+= PORTVERSION=${PORTVERSION}
PLIST_SUB+= MAJOR_VERSION="3"
OPTIONS_DEFINE= USRP TESTING
OPTIONS_DEFAULT= USRP
USRP_DESC= Include USRP support (UHD) from Ettus
TESTING_DESC= Include testing support
.include <bsd.port.options.mk>
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 800069
LIB_DEPENDS+= usb:${PORTSDIR}/devel/libusb
.endif
PLIST_SUB+= PORTVERSION=${PORTVERSION}
.if ${PORT_OPTIONS:MDOCS}
BUILD_DEPENDS+= doxygen:${PORTSDIR}/devel/doxygen \
@ -64,9 +61,11 @@ BUILD_DEPENDS+= doxygen:${PORTSDIR}/devel/doxygen \
${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_DOCS:STRING="ON"
HAVE_PORTDOCS= YES
.else
CMAKE_ARGS+= -DENABLE_DOXYGEN:STRING="OFF"
CMAKE_ARGS+= -DENABLE_DOCS:STRING="OFF"
.endif
.if ${PORT_OPTIONS:MUSRP}
@ -85,14 +84,44 @@ BUILD_DEPENDS+= cppunit-config:${PORTSDIR}/devel/cppunit
CMAKE_ARGS+= -DENABLE_TESTING:STRING="OFF"
.endif
.include <bsd.port.options.mk>
post-patch:
${FIND} ${WRKSRC}/.. -name CMakeLists.txt | \
${XARGS} ${REINPLACE_CMD} -e \
"s|{GR_LIBRARY_DIR}/pkgconfig|{GR_PKGCONFIG_DIR}/pkgconfig|g"
@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' \
${WRKSRC}/docs/doxygen/Doxyfile.in
@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
${WRKSRC}/cmake/Modules/FindPortaudio.cmake
PLISTMAIN= pkg-plist.main
PLISTDIRS= pkg-plist.dirs
PLIST= ${WRKDIR}/.pkg-plist
pre-install:
${MKDIR} ${PREFIX}/include/gruel
${INSTALL_DATA} ${WRKSRC}/gruel/src/include/gruel/*.h \
${PREFIX}/include/gruel
@${RM} -f ${PLIST}
@${CAT} ${PLISTMAIN} > ${PLIST}
@cd ${WRKDIR}/.build/docs/doxygen && ${FIND} html -type f | \
${SED} -e 's|html|%%PORTDOCS%%%%DOCSDIR%%/html|' \
| ${SORT} >> ${PLIST}
@cd ${WRKDIR}/.build/gr-trellis && ${FIND} doc -name \*.html -type f | \
${SED} -e 's|doc|%%PORTDOCS%%%%DOCSDIR%%/html|' \
| ${SORT} >> ${PLIST}
@cd ${WRKDIR}/.build/docs/doxygen && ${FIND} xml -type f | \
${SED} -e 's|xml|%%PORTDOCS%%%%DOCSDIR%%/xml|' \
| ${SORT} >> ${PLIST}
@cd ${WRKDIR}/.build/gr-trellis && ${FIND} doc -name \*.xml -type f | \
${SED} -e 's|doc|%%PORTDOCS%%%%DOCSDIR%%/xml|' \
| ${SORT} >> ${PLIST}
@${CAT} ${PLISTDIRS} >> ${PLIST}
@cd ${WRKDIR}/.build/docs/doxygen && ${FIND} html -type d | ${SORT} -r | \
${SED} -e 's|html|%%PORTDOCS%%@dirrm %%DOCSDIR%%/html|' \
>> ${PLIST}
@cd ${WRKDIR}/.build/docs/doxygen && ${FIND} xml -type d | ${SORT} -r | \
${SED} -e 's|xml|%%PORTDOCS%%@dirrm %%DOCSDIR%%/xml|' \
>> ${PLIST}
@${ECHO_CMD} "%%PORTDOCS%%@dirrm %%DOCSDIR%%" >> ${PLIST}
post-install:
.if defined(HAVE_PORTDOCS)

View File

@ -1,2 +1,2 @@
SHA256 (gnuradio-3.6.2.tar.gz) = 4ce84bf9c6591b5ddc2c384e03e40fc2f0cb8cd1add485ee2d6f26052cc6de35
SIZE (gnuradio-3.6.2.tar.gz) = 2604075
SHA256 (gnuradio-3.6.3.tar.gz) = bf4b2d7df2c078a6fccc0cf288d12bbb7617a9f86d453028db95f05e47745c9f
SIZE (gnuradio-3.6.3.tar.gz) = 2766447

View File

@ -1,6 +1,18 @@
--- CMakeLists.txt.orig 2012-09-04 19:43:13.000000000 -0500
+++ CMakeLists.txt 2012-10-26 16:35:52.000000000 -0500
@@ -96,6 +96,14 @@
--- 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 @@
########################################################################
include(GrPlatform) #define LIB_SUFFIX
set(GR_RUNTIME_DIR bin)
@ -15,7 +27,7 @@
set(GR_LIBRARY_DIR lib${LIB_SUFFIX})
set(GR_INCLUDE_DIR include)
set(GR_DATA_DIR share)
@@ -133,6 +141,22 @@
@@ -140,6 +149,22 @@
)
########################################################################
@ -38,18 +50,18 @@
# Enable python component
########################################################################
find_package(PythonLibs)
@@ -214,12 +238,13 @@
@@ -221,12 +246,13 @@
########################################################################
# Distribute the README file
########################################################################
+if(ENABLE_DOXYGEN)
+if(ENABLE_DOCS)
install(
FILES README README.hacking
DESTINATION ${GR_PKG_DOC_DIR}
COMPONENT "docs"
)
-
+endif(ENABLE_DOXYGEN)
+endif(ENABLE_DOCS)
########################################################################
# The following dependency libraries are needed by all gr modules:
########################################################################
# Add subdirectories (in order of deps)

View File

@ -1,5 +1,5 @@
--- cmake/Modules/FindPortaudio.cmake.orig 2012-09-04 19:43:06.000000000 -0500
+++ cmake/Modules/FindPortaudio.cmake 2012-09-28 20:05:36.000000000 -0500
--- cmake/Modules/FindPortaudio.cmake.orig 2013-01-08 15:56:55.000000000 -0500
+++ cmake/Modules/FindPortaudio.cmake 2013-04-23 07:47:40.000000000 -0500
@@ -6,7 +6,13 @@
# PORTAUDIO_LIBRARIES - Link these to use Portaudio
@ -8,8 +8,8 @@
+if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+ message( "--- Using Portaudio2 for FreeBSD")
+ set(PORTAUDIO_FOUND TRUE)
+ set(PORTAUDIO_INCLUDE_DIRS "/usr/local/include/portaudio2")
+ set(PORTAUDIO_LIBRARIES "/usr/local/lib/portaudio2/libportaudio.so")
+ set(PORTAUDIO_INCLUDE_DIRS "%%LOCALBASE%%/include/portaudio2")
+ set(PORTAUDIO_LIBRARIES "%%LOCALBASE%%/lib/portaudio2/libportaudio.so")
+else()
+ pkg_check_modules(PC_PORTAUDIO portaudio)

View File

@ -0,0 +1,34 @@
--- cmake/Modules/GrMiscUtils.cmake.orig 2013-01-08 15:56:55.000000000 -0500
+++ cmake/Modules/GrMiscUtils.cmake 2013-04-21 19:05:30.000000000 -0500
@@ -142,7 +142,31 @@
ARCHIVE DESTINATION ${GR_LIBRARY_DIR} COMPONENT ${GR_LIBRARY_DEVEL_COMPONENT} # .lib file
RUNTIME DESTINATION ${GR_RUNTIME_DIR} COMPONENT ${GR_LIBRARY_RUNTIME_COMPONENT} # .dll file
)
+
+ if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+ #create .la file
+ GR_LIBTOOL(TARGET ${target} DESTINATION ${GR_LIBRARY_DIR})
+ set_target_properties(${target} PROPERTIES OUTPUT_NAME ${target} SOVERSION ${LIBVER})
+ set(target_name lib${target}.so.${LIBVER})
+
+ #custom command to generate symlinks
+ add_custom_command(
+ TARGET ${target}
+ POST_BUILD
+ COMMAND ${CMAKE_COMMAND} -E create_symlink ${target_name} "${CMAKE_CURRENT_BINARY_DIR}/lib${target}.so"
+ COMMAND ${CMAKE_COMMAND} -E create_symlink ${target_name} "${CMAKE_CURRENT_BINARY_DIR}/lib${target}.so.${MAJOR_VERSION}"
+ COMMAND ${CMAKE_COMMAND} -E touch ${target_name} #so the symlinks point to something valid so cmake 2.6 will install
+ )
+
+ #and install the extra symlinks
+ install(
+ FILES
+ ${CMAKE_CURRENT_BINARY_DIR}/lib${target}.so.${MAJOR_VERSION}
+ ${CMAKE_CURRENT_BINARY_DIR}/lib${target}.so.${LIBVER}
+ DESTINATION ${GR_LIBRARY_DIR} COMPONENT ${GR_LIBRARY_RUNTIME_COMPONENT}
+ )
+ endif()
#extras mode enabled automatically on linux
if(NOT DEFINED LIBRARY_EXTRAS)
set(LIBRARY_EXTRAS ${LINUX})

View File

@ -1,6 +1,6 @@
--- docs/doxygen/Doxyfile.in.orig 2012-09-04 19:43:06.000000000 -0500
+++ docs/doxygen/Doxyfile.in 2012-10-21 17:33:21.000000000 -0500
@@ -1411,7 +1411,7 @@
--- 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 @@
# different font using DOT_FONTNAME you can set the path where dot
# can find it using this tag.

View File

@ -1,6 +1,6 @@
--- gnuradio-core/CMakeLists.txt.orig 2012-09-04 19:43:06.000000000 -0500
+++ gnuradio-core/CMakeLists.txt 2012-10-01 11:39:50.000000000 -0500
@@ -108,6 +108,15 @@
--- 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"
)
@ -16,12 +16,3 @@
install(
FILES gnuradio-core.conf
DESTINATION ${GR_PREFSDIR}
@@ -137,7 +146,7 @@
install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-core.pc
- DESTINATION ${GR_LIBRARY_DIR}/pkgconfig
+ DESTINATION ${GR_PKGCONFIG_DIR}/pkgconfig
COMPONENT "core_devel"
)

View File

@ -1,11 +0,0 @@
--- gr-atsc/CMakeLists.txt.orig 2012-09-30 11:27:22.000000000 -0500
+++ gr-atsc/CMakeLists.txt 2012-09-30 11:27:22.000000000 -0500
@@ -99,7 +99,7 @@
install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-atsc.pc
- DESTINATION ${GR_LIBRARY_DIR}/pkgconfig
+ DESTINATION ${GR_PKGCONFIG_DIR}/pkgconfig
COMPONENT "atsc_devel"
)

View File

@ -1,11 +0,0 @@
--- gr-audio/CMakeLists.txt.orig 2012-09-30 11:27:22.000000000 -0500
+++ gr-audio/CMakeLists.txt 2012-09-30 11:27:22.000000000 -0500
@@ -105,7 +105,7 @@
install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-audio.pc
- DESTINATION ${GR_LIBRARY_DIR}/pkgconfig
+ DESTINATION ${GR_PKGCONFIG_DIR}/pkgconfig
COMPONENT "audio_devel"
)

View File

@ -4,9 +4,9 @@
# the Free Software Foundation, Inc., 51 Franklin Street,
# Boston, MA 02110-1301, USA.
+if(ENABLE_DOXYGEN)
+if(ENABLE_DOCS)
install(
FILES README.audio
DESTINATION ${GR_PKG_DOC_DIR}
)
+endif(ENABLE_DOXYGEN)
+endif(ENABLE_DOCS)

View File

@ -1,11 +0,0 @@
--- gr-comedi/CMakeLists.txt.orig 2012-09-30 11:27:22.000000000 -0500
+++ gr-comedi/CMakeLists.txt 2012-09-30 11:27:22.000000000 -0500
@@ -97,7 +97,7 @@
install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-comedi.pc
- DESTINATION ${GR_LIBRARY_DIR}/pkgconfig
+ DESTINATION ${GR_PKGCONFIG_DIR}/pkgconfig
COMPONENT "comedi_devel"
)

View File

@ -1,11 +0,0 @@
--- gr-digital/CMakeLists.txt.orig 2012-09-30 11:27:22.000000000 -0500
+++ gr-digital/CMakeLists.txt 2012-09-30 11:27:22.000000000 -0500
@@ -103,7 +103,7 @@
install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-digital.pc
- DESTINATION ${GR_LIBRARY_DIR}/pkgconfig
+ DESTINATION ${GR_PKGCONFIG_DIR}/pkgconfig
COMPONENT "digital_devel"
)

View File

@ -4,9 +4,9 @@
# the Free Software Foundation, Inc., 51 Franklin Street,
# Boston, MA 02110-1301, USA.
+if(ENABLE_DOXYGEN)
+if(ENABLE_DOCS)
install(
FILES README.digital
DESTINATION ${GR_PKG_DOC_DIR}
)
+endif(ENABLE_DOXYGEN)
+endif(ENABLE_DOCS)

View File

@ -1,11 +0,0 @@
--- gr-fcd/CMakeLists.txt.orig 2012-09-30 11:27:22.000000000 -0500
+++ gr-fcd/CMakeLists.txt 2012-09-30 11:27:22.000000000 -0500
@@ -123,7 +123,7 @@
install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-fcd.pc
- DESTINATION ${GR_LIBRARY_DIR}/pkgconfig
+ DESTINATION ${GR_PKGCONFIG_DIR}/pkgconfig
COMPONENT "fcd_devel"
)

View File

@ -4,9 +4,9 @@
# the Free Software Foundation, Inc., 51 Franklin Street,
# Boston, MA 02110-1301, USA.
+if(ENABLE_DOXYGEN)
+if(ENABLE_DOCS)
install(
FILES README.fcd
DESTINATION ${GR_PKG_DOC_DIR}
)
+endif(ENABLE_DOXYGEN)
+endif(ENABLE_DOCS)

View File

@ -1,11 +0,0 @@
--- gr-fft/CMakeLists.txt.orig 2012-09-30 11:27:22.000000000 -0500
+++ gr-fft/CMakeLists.txt 2012-09-30 11:27:22.000000000 -0500
@@ -104,7 +104,7 @@
install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-fft.pc
- DESTINATION ${GR_LIBRARY_DIR}/pkgconfig
+ DESTINATION ${GR_PKGCONFIG_DIR}/pkgconfig
COMPONENT "fft_devel"
)

View File

@ -4,9 +4,9 @@
# the Free Software Foundation, Inc., 51 Franklin Street,
# Boston, MA 02110-1301, USA.
+if(ENABLE_DOXYGEN)
+if(ENABLE_DOCS)
install(
FILES README.fft
DESTINATION ${GR_PKG_DOC_DIR}
)
+endif(ENABLE_DOXYGEN)
+endif(ENABLE_DOCS)

View File

@ -1,11 +0,0 @@
--- gr-filter/CMakeLists.txt.orig 2012-09-30 11:27:21.000000000 -0500
+++ gr-filter/CMakeLists.txt 2012-09-30 11:27:21.000000000 -0500
@@ -106,7 +106,7 @@
install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-filter.pc
- DESTINATION ${GR_LIBRARY_DIR}/pkgconfig
+ DESTINATION ${GR_PKGCONFIG_DIR}/pkgconfig
COMPONENT "filter_devel"
)

View File

@ -4,9 +4,9 @@
# the Free Software Foundation, Inc., 51 Franklin Street,
# Boston, MA 02110-1301, USA.
+if(ENABLE_DOXYGEN)
+if(ENABLE_DOCS)
install(
FILES README.filter
DESTINATION ${GR_PKG_DOC_DIR}
)
+endif(ENABLE_DOXYGEN)
+endif(ENABLE_DOCS)

View File

@ -1,11 +0,0 @@
--- gr-noaa/CMakeLists.txt.orig 2012-09-30 11:27:22.000000000 -0500
+++ gr-noaa/CMakeLists.txt 2012-09-30 11:27:22.000000000 -0500
@@ -96,7 +96,7 @@
install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-noaa.pc
- DESTINATION ${GR_LIBRARY_DIR}/pkgconfig
+ DESTINATION ${GR_PKGCONFIG_DIR}/pkgconfig
COMPONENT "noaa_devel"
)

View File

@ -1,11 +0,0 @@
--- gr-pager/CMakeLists.txt.orig 2012-09-30 11:27:22.000000000 -0500
+++ gr-pager/CMakeLists.txt 2012-09-30 11:27:22.000000000 -0500
@@ -95,7 +95,7 @@
install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-pager.pc
- DESTINATION ${GR_LIBRARY_DIR}/pkgconfig
+ DESTINATION ${GR_PKGCONFIG_DIR}/pkgconfig
COMPONENT "pager_devel"
)

View File

@ -1,11 +0,0 @@
--- gr-qtgui/CMakeLists.txt.orig 2012-09-30 11:27:22.000000000 -0500
+++ gr-qtgui/CMakeLists.txt 2012-09-30 11:27:22.000000000 -0500
@@ -123,7 +123,7 @@
install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-qtgui.pc
- DESTINATION ${GR_LIBRARY_DIR}/pkgconfig
+ DESTINATION ${GR_PKGCONFIG_DIR}/pkgconfig
COMPONENT "qtgui_devel"
)

View File

@ -4,9 +4,9 @@
# the Free Software Foundation, Inc., 51 Franklin Street,
# Boston, MA 02110-1301, USA.
+if(ENABLE_DOXYGEN)
+if(ENABLE_DOCS)
install(
FILES README.qtgui
DESTINATION ${GR_PKG_DOC_DIR}
)
+endif(ENABLE_DOXYGEN)
+endif(ENABLE_DOCS)

View File

@ -1,11 +0,0 @@
--- gr-shd/CMakeLists.txt.orig 2012-09-30 11:27:21.000000000 -0500
+++ gr-shd/CMakeLists.txt 2012-09-30 11:27:21.000000000 -0500
@@ -120,7 +120,7 @@
install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-shd.pc
- DESTINATION ${GR_LIBRARY_DIR}/pkgconfig
+ DESTINATION ${GR_PKGCONFIG_DIR}/pkgconfig
COMPONENT "shd_devel"
)

View File

@ -1,11 +0,0 @@
--- gr-trellis/CMakeLists.txt.orig 2012-09-30 11:27:22.000000000 -0500
+++ gr-trellis/CMakeLists.txt 2012-09-30 11:27:22.000000000 -0500
@@ -113,7 +113,7 @@
install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-trellis.pc
- DESTINATION ${GR_LIBRARY_DIR}/pkgconfig
+ DESTINATION ${GR_PKGCONFIG_DIR}/pkgconfig
COMPONENT "trellis_devel"
)

View File

@ -4,14 +4,14 @@
${CMAKE_CURRENT_SOURCE_DIR}/gr-trellis.xml
)
add_custom_target(gr_trellis_html ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/gr-trellis.html)
+if(ENABLE_DOXYGEN)
+if(ENABLE_DOCS)
install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/gr-trellis.html
DESTINATION ${GR_PKG_DOC_DIR}/html
COMPONENT "trellis_docs"
)
+endif(ENABLE_DOXYGEN)
+endif(ENABLE_DOCS)
endif(XMLTO_EXECUTABLE)
########################################################################
@ -19,11 +19,11 @@
${CMAKE_CURRENT_BINARY_DIR}/test_tcm.py.xml
${CMAKE_CURRENT_BINARY_DIR}/test_viterbi_equalization1.py.xml
)
+if(ENABLE_DOXYGEN)
+if(ENABLE_DOCS)
install(FILES
${CMAKE_CURRENT_BINARY_DIR}/test_tcm.py.xml
${CMAKE_CURRENT_BINARY_DIR}/test_viterbi_equalization1.py.xml
DESTINATION ${GR_PKG_DOC_DIR}/xml
COMPONENT "trellis_docs"
)
+endif(ENABLE_DOXYGEN)
+endif(ENABLE_DOCS)

View File

@ -1,11 +0,0 @@
--- gr-uhd/CMakeLists.txt.orig 2012-09-30 11:27:22.000000000 -0500
+++ gr-uhd/CMakeLists.txt 2012-09-30 11:27:22.000000000 -0500
@@ -112,7 +112,7 @@
install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-uhd.pc
- DESTINATION ${GR_LIBRARY_DIR}/pkgconfig
+ DESTINATION ${GR_PKGCONFIG_DIR}/pkgconfig
COMPONENT "uhd_devel"
)

View File

@ -4,9 +4,9 @@
# the Free Software Foundation, Inc., 51 Franklin Street,
# Boston, MA 02110-1301, USA.
+if(ENABLE_DOXYGEN)
+if(ENABLE_DOCS)
install(
FILES README.uhd
DESTINATION ${GR_PKG_DOC_DIR}
)
+endif(ENABLE_DOXYGEN)
+endif(ENABLE_DOCS)

View File

@ -1,11 +0,0 @@
--- gr-video-sdl/CMakeLists.txt.orig 2012-09-30 11:27:22.000000000 -0500
+++ gr-video-sdl/CMakeLists.txt 2012-09-30 11:27:22.000000000 -0500
@@ -92,7 +92,7 @@
install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-video-sdl.pc
- DESTINATION ${GR_LIBRARY_DIR}/pkgconfig
+ DESTINATION ${GR_PKGCONFIG_DIR}/pkgconfig
COMPONENT "video_sdl_devel"
)

View File

@ -1,11 +0,0 @@
--- gr-vocoder/CMakeLists.txt.orig 2012-09-30 11:27:22.000000000 -0500
+++ gr-vocoder/CMakeLists.txt 2012-09-30 11:27:22.000000000 -0500
@@ -106,7 +106,7 @@
install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-vocoder.pc
- DESTINATION ${GR_LIBRARY_DIR}/pkgconfig
+ DESTINATION ${GR_PKGCONFIG_DIR}/pkgconfig
COMPONENT "vocoder_devel"
)

View File

@ -4,9 +4,9 @@
# the Free Software Foundation, Inc., 51 Franklin Street,
# Boston, MA 02110-1301, USA.
+if(ENABLE_DOXYGEN)
+if(ENABLE_DOCS)
install(
FILES README.vocoder
DESTINATION ${GR_PKG_DOC_DIR}
)
+endif(ENABLE_DOXYGEN)
+endif(ENABLE_DOCS)

View File

@ -1,11 +0,0 @@
--- gr-wavelet/CMakeLists.txt.orig 2012-09-30 11:27:22.000000000 -0500
+++ gr-wavelet/CMakeLists.txt 2012-09-30 11:27:22.000000000 -0500
@@ -102,7 +102,7 @@
install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-wavelet.pc
- DESTINATION ${GR_LIBRARY_DIR}/pkgconfig
+ DESTINATION ${GR_PKGCONFIG_DIR}/pkgconfig
COMPONENT "wavelet_devel"
)

View File

@ -1,17 +1,6 @@
--- gr-wxgui/CMakeLists.txt.orig 2012-09-04 19:43:06.000000000 -0500
+++ gr-wxgui/CMakeLists.txt 2012-10-01 11:49:03.000000000 -0500
@@ -64,16 +64,24 @@
${CMAKE_CURRENT_SOURCE_DIR}/gr-wxgui.pc.in
${CMAKE_CURRENT_BINARY_DIR}/gr-wxgui.pc
@ONLY)
-
install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/gr-wxgui.pc
- DESTINATION ${GR_LIBRARY_DIR}/pkgconfig
+ DESTINATION ${GR_PKGCONFIG_DIR}/pkgconfig
COMPONENT "wxgui"
)
--- 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 @@
########################################################################
# Install the conf file
########################################################################

View File

@ -1,11 +0,0 @@
--- gruel/CMakeLists.txt.orig 2012-09-30 11:27:22.000000000 -0500
+++ gruel/CMakeLists.txt 2012-09-30 11:27:22.000000000 -0500
@@ -97,7 +97,7 @@
install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/gruel.pc
- DESTINATION ${GR_LIBRARY_DIR}/pkgconfig
+ DESTINATION ${GR_PKGCONFIG_DIR}/pkgconfig
COMPONENT "gruel_devel"
)

View File

@ -1,22 +1,11 @@
--- volk/CMakeLists.txt.orig 2012-09-04 19:43:06.000000000 -0500
+++ volk/CMakeLists.txt 2012-09-30 14:19:03.000000000 -0500
@@ -93,11 +93,19 @@
${CMAKE_CURRENT_BINARY_DIR}/volk.pc
@ONLY)
--- 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 @@
+if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+install(
+ FILES ${CMAKE_CURRENT_BINARY_DIR}/volk.pc
+ DESTINATION libdata${LIB_SUFFIX}/pkgconfig
+ COMPONENT "volk_devel"
+)
+else()
install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/volk.pc
DESTINATION lib${LIB_SUFFIX}/pkgconfig
- DESTINATION lib${LIB_SUFFIX}/pkgconfig
+ DESTINATION ${GR_PKGCONFIG_DIR}/pkgconfig
COMPONENT "volk_devel"
)
+endif()
########################################################################
# Install all headers in the include directories

View File

@ -4,4 +4,4 @@ actual waveforms transmitted and received are defined by software.
What this means is that it turns the digital modulation schemes
used in today's high performance wireless devices into software problems.
WWW: http://gnuradio.org/redmine/projects/gnuradio
WWW: http://gnuradio.org/redmine/projects/gnuradio

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,76 @@
@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
@dirrm %%PYTHON_SITELIBDIR%%/gnuradio/fcd
@dirrm %%PYTHON_SITELIBDIR%%/gnuradio/fft
@dirrm %%PYTHON_SITELIBDIR%%/gnuradio/filter
@dirrm %%PYTHON_SITELIBDIR%%/gnuradio/gr
@dirrm %%PYTHON_SITELIBDIR%%/gnuradio/grc/base
@dirrm %%PYTHON_SITELIBDIR%%/gnuradio/grc/gui
@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
%%UHD%%@dirrm %%PYTHON_SITELIBDIR%%/gnuradio/uhd
@dirrm %%PYTHON_SITELIBDIR%%/gnuradio/vocoder
@dirrm %%PYTHON_SITELIBDIR%%/gnuradio/wavelet
@dirrm %%PYTHON_SITELIBDIR%%/gnuradio/wxgui/forms
@dirrm %%PYTHON_SITELIBDIR%%/gnuradio/wxgui/plotter
@dirrm %%PYTHON_SITELIBDIR%%/gnuradio/wxgui
@dirrm %%PYTHON_SITELIBDIR%%/gnuradio
@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
@dirrm include/gnuradio/blocks
@dirrm include/gnuradio/fft
@dirrm include/gnuradio/filter
@dirrm include/gnuradio/swig
@dirrm include/gnuradio
@dirrm include/gruel/swig
@dirrm include/gruel
@dirrm include/volk
@dirrmtry libdata/pkgconfig
@dirrm libexec/gnuradio
@dirrm share/gnuradio/examples/atsc
@dirrm share/gnuradio/examples/audio
@dirrm share/gnuradio/examples/digital/demod
@dirrm share/gnuradio/examples/digital/narrowband
@dirrm share/gnuradio/examples/digital/ofdm
@dirrm share/gnuradio/examples/digital
@dirrm share/gnuradio/examples/fcd
@dirrm share/gnuradio/examples/filter
@dirrm share/gnuradio/examples/grc/simple
@dirrm share/gnuradio/examples/grc/xmlrpc
@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
@dirrm share/gnuradio/examples/trellis
%%UHD%%@dirrm share/gnuradio/examples/hf_explorer
%%UHD%%@dirrm share/gnuradio/examples/uhd
@dirrm share/gnuradio/examples/vocoder
@dirrm share/gnuradio/examples/volk_benchmark
@dirrm share/gnuradio/examples
@dirrm share/gnuradio/grc/blocks
@dirrm share/gnuradio/grc/freedesktop
@dirrm share/gnuradio/grc
@dirrm share/gnuradio

File diff suppressed because it is too large Load Diff