From owner-svn-ports-head@FreeBSD.ORG Sun Apr 28 17:34:20 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 7148BA05; Sun, 28 Apr 2013 17:34:20 +0000 (UTC) (envelope-from nox@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 53DF71EC2; Sun, 28 Apr 2013 17:34:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3SHYKa8095383; Sun, 28 Apr 2013 17:34:20 GMT (envelope-from nox@svn.freebsd.org) Received: (from nox@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3SHYIF4095369; Sun, 28 Apr 2013 17:34:18 GMT (envelope-from nox@svn.freebsd.org) Message-Id: <201304281734.r3SHYIF4095369@svn.freebsd.org> From: Juergen Lock Date: Sun, 28 Apr 2013 17:34:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r316735 - in head/comms: . dabstick-radio dabstick-radio/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: Sun, 28 Apr 2013 17:34:20 -0000 Author: nox Date: Sun Apr 28 17:34:17 2013 New Revision: 316735 URL: http://svnweb.freebsd.org/changeset/ports/316735 Log: Add new port comms/dabstick-radio: While preparing for a release 4.2 of the sdr-j software package, we created two new programs a DAB receiver a broad spectrum version of the FM receiver It is quite obvious that one can use a DAB stick to receive DAB programs. However, the DAB software presented here is a real SDR in that it uses the 8 bit I/Q samples of the DAB stick. WWW: http://www.sdr-j.tk/ Added: head/comms/dabstick-radio/ head/comms/dabstick-radio/Makefile (contents, props changed) head/comms/dabstick-radio/distinfo (contents, props changed) head/comms/dabstick-radio/files/ head/comms/dabstick-radio/files/patch-dabreceiver-V2_dabreceiver.pro (contents, props changed) head/comms/dabstick-radio/files/patch-filters_fir-filters.cpp (contents, props changed) head/comms/dabstick-radio/files/patch-filters_iir-filters.cpp (contents, props changed) head/comms/dabstick-radio/files/patch-fmreceiver-dab_fmreceiver.pro (contents, props changed) head/comms/dabstick-radio/files/patch-jff-include.h (contents, props changed) head/comms/dabstick-radio/files/patch-utilities_decimator.cpp (contents, props changed) head/comms/dabstick-radio/pkg-descr (contents, props changed) Modified: head/comms/Makefile Modified: head/comms/Makefile ============================================================================== --- head/comms/Makefile Sun Apr 28 17:00:36 2013 (r316734) +++ head/comms/Makefile Sun Apr 28 17:34:17 2013 (r316735) @@ -25,6 +25,7 @@ SUBDIR += conserver-com SUBDIR += cutecom SUBDIR += cwdaemon + SUBDIR += dabstick-radio SUBDIR += deforaos-phone SUBDIR += dfu-programmer SUBDIR += dfu-util Added: head/comms/dabstick-radio/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/dabstick-radio/Makefile Sun Apr 28 17:34:17 2013 (r316735) @@ -0,0 +1,62 @@ +# Created by: Juergen Lock +# $FreeBSD$ + +PORTNAME= dabstick-radio +PORTVERSION= 0.1 +CATEGORIES= comms audio hamradio +MASTER_SITES= http://www.sdr-j.tk/ +DISTNAME= ${PORTNAME} +EXTRACT_SUFX= .tgz + +MAINTAINER= nox@FreeBSD.org +COMMENT= DAB/DAB+ and wideband FM receiver for RTL2832-based USB sticks + +LICENSE= GPLv2 + +LIB_DEPENDS+= rtlsdr:${PORTSDIR}/comms/rtl-sdr \ + qwt:${PORTSDIR}/x11-toolkits/qwt5 \ + portaudio.2:${PORTSDIR}/audio/portaudio2 \ + samplerate:${PORTSDIR}/audio/libsamplerate \ + avcodec${FFMPEG_SUFFIX}:${PORTSDIR}/multimedia/ffmpeg${FFMPEG_SUFFIX} \ + fftw3:${PORTSDIR}/math/fftw3 \ + faad:${PORTSDIR}/audio/faad + +USE_QT4= gui qt3support qmake_build moc_build rcc_build uic_build + +FFMPEG_SUFFIX= 1 + +QMAKE_DABSTICK= ${QMAKE} -unix PREFIX=${PREFIX} -o +MAKE_ENV+= FFMPEG_SUFFIX=${FFMPEG_SUFFIX} +MAKE_JOBS_SAFE= yes + +PORTDOCS= dab-manual.pdf +PLIST_FILES+= bin/dabreceiver bin/fmreceiver + +.include + +.if ${OSVERSION} < 800069 +IGNORE= requires FreeBSD 8.0 or later +.endif + +do-configure: + cd ${WRKSRC}/fmreceiver-dab && ${SETENV} ${MAKE_ENV} \ + ${QMAKE_DABSTICK} Makefile fmreceiver.pro + cd ${WRKSRC}/dabreceiver-V2 && ${SETENV} ${MAKE_ENV} \ + ${QMAKE_DABSTICK} Makefile dabreceiver.pro + +do-build: + cd ${WRKSRC}/fmreceiver-dab && ${SETENV} ${MAKE_ENV} \ + ${MAKE} ${_MAKE_JOBS} + cd ${WRKSRC}/dabreceiver-V2 && ${SETENV} ${MAKE_ENV} \ + ${MAKE} ${_MAKE_JOBS} + +do-install: + ${INSTALL} ${WRKSRC}/fmreceiver-dab/fmreceiver \ + ${WRKSRC}/dabreceiver-V2/dabreceiver \ + ${PREFIX}/bin +.if ${PORT_OPTIONS:MDOCS} + ${MKDIR} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/dab-manual.pdf ${DOCSDIR} +.endif + +.include Added: head/comms/dabstick-radio/distinfo ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/dabstick-radio/distinfo Sun Apr 28 17:34:17 2013 (r316735) @@ -0,0 +1,2 @@ +SHA256 (dabstick-radio.tgz) = 5270f245abe653e714c2559848efa092d4deaee09626b2f5d8c93d7de80280e1 +SIZE (dabstick-radio.tgz) = 506372 Added: head/comms/dabstick-radio/files/patch-dabreceiver-V2_dabreceiver.pro ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/dabstick-radio/files/patch-dabreceiver-V2_dabreceiver.pro Sun Apr 28 17:34:17 2013 (r316735) @@ -0,0 +1,42 @@ +--- dabreceiver-V2/dabreceiver.pro.orig ++++ dabreceiver-V2/dabreceiver.pro +@@ -135,15 +135,35 @@ LIBS += -lfaad + #} + + #for fedora use the second set ++#unix { ++# HEADERS += ../input/dabstick.h ++# SOURCES += ../input/dabstick.cpp ++# INCLUDEPATH += /usr/include/qwt5-qt4 ++# INCLUDEPATH += /usr/include/ ++# INCLUDEPATH += /usr/include/ffmpeg ++# LIBS+= -lqwt5-qt4 -lusb-1.0 -lrt -lportaudio -lsamplerate -lfftw3 -lrtlsdr -ldl -lz ++##uncomment the following line when using the libav package for ffmpeg ++# LIBS+= -lavcodec -lavdevice -lavutil -lavformat -lswresample -lswscale -lavfilter ++##uncomment the following line when using the faad library ++# LIBS += -lfaad ++# ++#} ++ ++#for FreeBSD use the third set + unix { + HEADERS += ../input/dabstick.h + SOURCES += ../input/dabstick.cpp +- INCLUDEPATH += /usr/include/qwt5-qt4 ++ INCLUDEPATH += ${LOCALBASE}/include/qwt ++ INCLUDEPATH += ${LOCALBASE}/include/portaudio2 ++ INCLUDEPATH += ${LOCALBASE}/include/ffmpeg1 ++ INCLUDEPATH += ${LOCALBASE}/include + INCLUDEPATH += /usr/include/ +- INCLUDEPATH += /usr/include/ffmpeg +- LIBS+= -lqwt5-qt4 -lusb-1.0 -lrt -lportaudio -lsamplerate -lfftw3 -lrtlsdr -ldl -lz ++ QMAKE_LIBDIR = ${LOCALBASE}/lib/portaudio2 ++ QMAKE_LIBDIR += ${LOCALBASE}/lib/ffmpeg${FFMPEG_SUFFIX} ++ QMAKE_LIBDIR += ${LOCALBASE}/lib ++ LIBS+= -lqwt -lusb -lrt -lportaudio -lsamplerate -lfftw3 -lrtlsdr -lz + #uncomment the following line when using the libav package for ffmpeg +- LIBS+= -lavcodec -lavdevice -lavutil -lavformat -lswresample -lswscale -lavfilter ++ LIBS+= -lavcodec${FFMPEG_SUFFIX} -lavdevice${FFMPEG_SUFFIX} -lavutil${FFMPEG_SUFFIX} -lavformat${FFMPEG_SUFFIX} -lswresample${FFMPEG_SUFFIX} -lswscale${FFMPEG_SUFFIX} -lavfilter${FFMPEG_SUFFIX} + #uncomment the following line when using the faad library + LIBS += -lfaad + Added: head/comms/dabstick-radio/files/patch-filters_fir-filters.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/dabstick-radio/files/patch-filters_fir-filters.cpp Sun Apr 28 17:34:17 2013 (r316735) @@ -0,0 +1,15 @@ +--- filters/fir-filters.cpp.orig ++++ filters/fir-filters.cpp +@@ -28,8 +28,12 @@ + + #include "fir-filters.h" + #ifndef __MINGW32__ ++#ifdef __FreeBSD__ ++#include ++#else + #include "alloca.h" + #endif ++#endif + + //=================================================================== + //===================================================================== Added: head/comms/dabstick-radio/files/patch-filters_iir-filters.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/dabstick-radio/files/patch-filters_iir-filters.cpp Sun Apr 28 17:34:17 2013 (r316735) @@ -0,0 +1,15 @@ +--- filters/iir-filters.cpp.orig ++++ filters/iir-filters.cpp +@@ -28,8 +28,12 @@ + + #include "iir-filters.h" + #ifndef __MINGW32__ ++#ifdef __FreeBSD__ ++#include ++#else + #include "alloca.h" + #endif ++#endif + + #define MAXORDER 0176 + Added: head/comms/dabstick-radio/files/patch-fmreceiver-dab_fmreceiver.pro ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/dabstick-radio/files/patch-fmreceiver-dab_fmreceiver.pro Sun Apr 28 17:34:17 2013 (r316735) @@ -0,0 +1,32 @@ +--- fmreceiver-dab/fmreceiver.pro.orig ++++ fmreceiver-dab/fmreceiver.pro +@@ -121,13 +121,26 @@ LIBS += -lstdc++ + #} + + #for fedora use the second set ++#unix { ++# HEADERS += ../input/dabstick.h ++# SOURCES += ../input/dabstick.cpp ++# INCLUDEPATH += /usr/include/qwt5-qt4 ++# INCLUDEPATH += /usr/local/include ++# INCLUDEPATH += /usr/include/ ++# LIBS+= -lqwt5-qt4 -lusb-1.0 -lrt -lportaudio -lsndfile -lsamplerate -lfftw3 -lrtlsdr -ldl ++#} ++ ++#for FreeBSD use the third set + unix { + HEADERS += ../input/dabstick.h + SOURCES += ../input/dabstick.cpp +- INCLUDEPATH += /usr/include/qwt5-qt4 +- INCLUDEPATH += /usr/local/include ++ INCLUDEPATH += ${LOCALBASE}/include/qwt ++ INCLUDEPATH += ${LOCALBASE}/include/portaudio2 ++ INCLUDEPATH += ${LOCALBASE}/include + INCLUDEPATH += /usr/include/ +- LIBS+= -lqwt5-qt4 -lusb-1.0 -lrt -lportaudio -lsndfile -lsamplerate -lfftw3 -lrtlsdr -ldl ++ QMAKE_LIBDIR = ${LOCALBASE}/lib/portaudio2 ++ QMAKE_LIBDIR += ${LOCALBASE}/lib ++ LIBS+= -lqwt -lusb -lrt -lportaudio -lsndfile -lsamplerate -lfftw3 -lrtlsdr + } + + Added: head/comms/dabstick-radio/files/patch-jff-include.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/dabstick-radio/files/patch-jff-include.h Sun Apr 28 17:34:17 2013 (r316735) @@ -0,0 +1,21 @@ +--- jff-include.h.orig ++++ jff-include.h +@@ -32,12 +32,18 @@ + #include + #include + ++#ifdef __FreeBSD__ ++#include ++#else + #include ++#endif + + #ifdef __MINGW32__ + #include "windows.h" + #else ++#ifndef __FreeBSD__ + #include "alloca.h" ++#endif + #include "dlfcn.h" + typedef void *HINSTANCE; + #endif Added: head/comms/dabstick-radio/files/patch-utilities_decimator.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/dabstick-radio/files/patch-utilities_decimator.cpp Sun Apr 28 17:34:17 2013 (r316735) @@ -0,0 +1,13 @@ +--- utilities/decimator.cpp.orig ++++ utilities/decimator.cpp +@@ -67,8 +67,8 @@ bool downDecimator::doDecimate (DSPFLOAT + */ + this -> inSamplerate = inSamplerate; + this -> outSamplerate = outSamplerate; +- inperiod = (int64_t)(100000000000) / inSamplerate; +- outperiod = (int64_t)(100000000000) / outSamplerate; ++ inperiod = (int64_t)(100000000000LL) / inSamplerate; ++ outperiod = (int64_t)(100000000000LL) / outSamplerate; + oldinsampleTime = 0; + currentinsampleTime = 0; + oldinsampleValue = 0; Added: head/comms/dabstick-radio/pkg-descr ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/dabstick-radio/pkg-descr Sun Apr 28 17:34:17 2013 (r316735) @@ -0,0 +1,11 @@ +While preparing for a release 4.2 of the sdr-j software package, +we created two new programs + + a DAB receiver + a broad spectrum version of the FM receiver + +It is quite obvious that one can use a DAB stick to receive DAB +programs. However, the DAB software presented here is a real SDR +in that it uses the 8 bit I/Q samples of the DAB stick. + +WWW: http://www.sdr-j.tk/