From owner-svn-ports-head@FreeBSD.ORG Thu Jul 25 18:53:34 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 6BD98B30; Thu, 25 Jul 2013 18:53:34 +0000 (UTC) (envelope-from nox@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 48A8429B4; Thu, 25 Jul 2013 18:53:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6PIrYIQ049859; Thu, 25 Jul 2013 18:53:34 GMT (envelope-from nox@svn.freebsd.org) Received: (from nox@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6PIrV82049831; Thu, 25 Jul 2013 18:53:31 GMT (envelope-from nox@svn.freebsd.org) Message-Id: <201307251853.r6PIrV82049831@svn.freebsd.org> From: Juergen Lock Date: Thu, 25 Jul 2013 18:53:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r323661 - in head/comms: . jsdr jsdr/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: Thu, 25 Jul 2013 18:53:34 -0000 Author: nox Date: Thu Jul 25 18:53:30 2013 New Revision: 323661 URL: http://svnweb.freebsd.org/changeset/ports/323661 Log: Add new port comms/jsdr: SDR-J (formerly Jsdr) is a suite of four programs provided under a LGPL open source license for playing around with sdr (software defined radio). The software can be used directly with the PM-SDR kit and RTL2832U based dongles, and in the 32 bits Windows version with other kits as well. The suite contains four programs: - a full blown "short wave" receiver, which provides tuning in the range of 100K .. 165M using the PM-SDR (although above 55 M with reduced performance) and from app 55 MHz to app 900 Mhz or above using an RTL2832U based dongle. The receiver provides quite a number of decoders for amateur modes. - am/fm receiver covering the same frequency bands as the sw receiver, however, with am bandwidths selectable, with fm mono and stereo decoding as well as with rds decoding. - spectrum viewer for use with the RTL2832U based dongles, showing spectra of up to 3 Mhz bandwidth. - mini receiver, a stripped version of the fm receiver, a gadget for listening to WFM using DAB sticks. WWW: http://www.sdr-j.tk/ Added: head/comms/jsdr/ head/comms/jsdr/Makefile (contents, props changed) head/comms/jsdr/distinfo (contents, props changed) head/comms/jsdr/files/ head/comms/jsdr/files/patch-filters_fir-filters.cpp (contents, props changed) head/comms/jsdr/files/patch-filters_iir-filters.cpp (contents, props changed) head/comms/jsdr/files/patch-make-x64_fmreceiver_fmreceiver.pro (contents, props changed) head/comms/jsdr/files/patch-make-x64_jff-include.h (contents, props changed) head/comms/jsdr/files/patch-make-x64_mini-receiver_mini-receiver.pro (contents, props changed) head/comms/jsdr/files/patch-make-x64_spectrum-viewer_spectrum-viewer.pro (contents, props changed) head/comms/jsdr/files/patch-make-x64_swreceiver_swreceiver.pro (contents, props changed) head/comms/jsdr/files/patch-righandling_dabstick-2_librtlsdr.c (contents, props changed) head/comms/jsdr/files/patch-righandling_pmsdr_pmsdr_usb.h (contents, props changed) head/comms/jsdr/files/patch-swreceiver_swdecoders_domino_dominodecoder.cpp (contents, props changed) head/comms/jsdr/files/patch-swreceiver_swdecoders_mfskdecoder_mfskdecoder.cpp (contents, props changed) head/comms/jsdr/files/patch-utilities_decimator.cpp (contents, props changed) head/comms/jsdr/pkg-descr (contents, props changed) Modified: head/comms/Makefile Modified: head/comms/Makefile ============================================================================== --- head/comms/Makefile Thu Jul 25 18:30:17 2013 (r323660) +++ head/comms/Makefile Thu Jul 25 18:53:30 2013 (r323661) @@ -70,6 +70,7 @@ SUBDIR += java-commapi SUBDIR += java-commapi-freebsd SUBDIR += jerm + SUBDIR += jsdr SUBDIR += kallers SUBDIR += kb SUBDIR += kermit Added: head/comms/jsdr/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/jsdr/Makefile Thu Jul 25 18:53:30 2013 (r323661) @@ -0,0 +1,64 @@ +# Created by: Juergen Lock +# $FreeBSD$ + +PORTNAME= jsdr +PORTVERSION= 4.1 +CATEGORIES= comms audio hamradio +MASTER_SITES= http://www.sdr-j.tk/ +EXTRACT_SUFX= .tgz + +MAINTAINER= nox@FreeBSD.org +COMMENT= SDR tools for RTL2832-based USB sticks + +LICENSE= GPLv2 + +LIB_DEPENDS+= qwt:${PORTSDIR}/x11-toolkits/qwt5 \ + portaudio.2:${PORTSDIR}/audio/portaudio2 \ + samplerate:${PORTSDIR}/audio/libsamplerate \ + sndfile:${PORTSDIR}/audio/libsndfile \ + fftw3:${PORTSDIR}/math/fftw3 + +USE_QT4= gui qt3support qmake_build moc_build rcc_build uic_build + +QMAKE_DABSTICK= ${QMAKE} -unix PREFIX=${PREFIX} -o + +PORTDOCS= * +PLIST_FILES+= bin/swreceiver bin/spectrum-viewer-${PORTVERSION} \ + bin/mini-receiver bin/fmreceiver-${PORTVERSION} + +.include + +do-configure: + cd ${WRKSRC}/make-x64/swreceiver && ${SETENV} ${MAKE_ENV} \ + ${QMAKE_DABSTICK} Makefile swreceiver.pro + cd ${WRKSRC}/make-x64/fmreceiver && ${SETENV} ${MAKE_ENV} \ + ${QMAKE_DABSTICK} Makefile fmreceiver.pro + cd ${WRKSRC}/make-x64/spectrum-viewer && ${SETENV} ${MAKE_ENV} \ + ${QMAKE_DABSTICK} Makefile spectrum-viewer.pro + cd ${WRKSRC}/make-x64/mini-receiver && ${SETENV} ${MAKE_ENV} \ + ${QMAKE_DABSTICK} Makefile mini-receiver.pro + +do-build: + cd ${WRKSRC}/make-x64/swreceiver && ${SETENV} ${MAKE_ENV} \ + ${MAKE} ${_MAKE_JOBS} + cd ${WRKSRC}/make-x64/fmreceiver && ${SETENV} ${MAKE_ENV} \ + ${MAKE} ${_MAKE_JOBS} + cd ${WRKSRC}/make-x64/spectrum-viewer && ${SETENV} ${MAKE_ENV} \ + ${MAKE} ${_MAKE_JOBS} + cd ${WRKSRC}/make-x64/mini-receiver && ${SETENV} ${MAKE_ENV} \ + ${MAKE} ${_MAKE_JOBS} + +do-install: + ${INSTALL} ${WRKSRC}/make-x64/swreceiver/swreceiver \ + ${WRKSRC}/make-x64/mini-receiver/mini-receiver \ + ${PREFIX}/bin + ${INSTALL} ${WRKSRC}/make-x64/spectrum-viewer/spectrum-viewer \ + ${PREFIX}/bin/spectrum-viewer-${PORTVERSION} + ${INSTALL} ${WRKSRC}/make-x64/fmreceiver/fmreceiver \ + ${PREFIX}/bin/fmreceiver-${PORTVERSION} +.if ${PORT_OPTIONS:MDOCS} + ${MKDIR} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/docs/* ${DOCSDIR} +.endif + +.include Added: head/comms/jsdr/distinfo ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/jsdr/distinfo Thu Jul 25 18:53:30 2013 (r323661) @@ -0,0 +1,2 @@ +SHA256 (jsdr-4.1.tgz) = 6c9f828378d3d9433de5b1d9db533faecfcc7e81b9577b3e510aee42ac3db97b +SIZE (jsdr-4.1.tgz) = 2753477 Added: head/comms/jsdr/files/patch-filters_fir-filters.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/jsdr/files/patch-filters_fir-filters.cpp Thu Jul 25 18:53:30 2013 (r323661) @@ -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/jsdr/files/patch-filters_iir-filters.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/jsdr/files/patch-filters_iir-filters.cpp Thu Jul 25 18:53:30 2013 (r323661) @@ -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/jsdr/files/patch-make-x64_fmreceiver_fmreceiver.pro ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/jsdr/files/patch-make-x64_fmreceiver_fmreceiver.pro Thu Jul 25 18:53:30 2013 (r323661) @@ -0,0 +1,24 @@ +--- make-x64/fmreceiver/fmreceiver.pro.orig ++++ make-x64/fmreceiver/fmreceiver.pro +@@ -137,9 +137,18 @@ LIBS += -lstdc++ + #} + + #for fedora use the second set +-unix { INCLUDEPATH += /usr/include/qwt +- INCLUDEPATH += /usr/include/ +- LIBS+= -lqwt -lusb-1.0 -lrt -lportaudio -lsndfile -lsamplerate -lfftw3 -ldl ++#unix { INCLUDEPATH += /usr/include/qwt ++# INCLUDEPATH += /usr/include/ ++# LIBS+= -lqwt -lusb-1.0 -lrt -lportaudio -lsndfile -lsamplerate -lfftw3 -ldl ++#} ++ ++#for FreeBSD use the third set ++unix { INCLUDEPATH += ${LOCALBASE}/include/qwt ++ INCLUDEPATH += ${LOCALBASE}/include/portaudio2 ++ INCLUDEPATH += ${LOCALBASE}/include ++ QMAKE_LIBDIR = ${LOCALBASE}/lib/portaudio2 ++ QMAKE_LIBDIR += ${LOCALBASE}/lib ++ LIBS+= -lqwt -lusb -lrt -lportaudio -lsndfile -lsamplerate -lfftw3 + } + + Added: head/comms/jsdr/files/patch-make-x64_jff-include.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/jsdr/files/patch-make-x64_jff-include.h Thu Jul 25 18:53:30 2013 (r323661) @@ -0,0 +1,19 @@ +--- make-x64/jff-include.h.orig ++++ make-x64/jff-include.h +@@ -32,10 +32,16 @@ + #include + #include + ++#ifdef __FreeBSD__ ++#include ++#else + #include ++#endif + #ifndef __MINGW32__ ++#ifndef __FreeBSD__ + #include "alloca.h" + #endif ++#endif + + #ifdef __MINGW32__ + #define CURRENT_VERSION "4.1:x64" Added: head/comms/jsdr/files/patch-make-x64_mini-receiver_mini-receiver.pro ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/jsdr/files/patch-make-x64_mini-receiver_mini-receiver.pro Thu Jul 25 18:53:30 2013 (r323661) @@ -0,0 +1,24 @@ +--- make-x64/mini-receiver/mini-receiver.pro.orig ++++ make-x64/mini-receiver/mini-receiver.pro +@@ -108,9 +108,18 @@ LIBS += -lstdc++ + #} + + #for fedora use the second set +-unix { INCLUDEPATH += /usr/include/qwt +- INCLUDEPATH += /usr/include/ +- LIBS+= -lqwt -lusb-1.0 -lrt -lportaudio -lsndfile -lsamplerate -lfftw3 -ldl ++#unix { INCLUDEPATH += /usr/include/qwt ++# INCLUDEPATH += /usr/include/ ++# LIBS+= -lqwt -lusb-1.0 -lrt -lportaudio -lsndfile -lsamplerate -lfftw3 -ldl ++#} ++ ++#for FreeBSD use the third set ++unix { INCLUDEPATH += ${LOCALBASE}/include/qwt ++ INCLUDEPATH += ${LOCALBASE}/include/portaudio2 ++ INCLUDEPATH += ${LOCALBASE}/include ++ QMAKE_LIBDIR = ${LOCALBASE}/lib/portaudio2 ++ QMAKE_LIBDIR += ${LOCALBASE}/lib ++ LIBS+= -lqwt -lusb -lrt -lportaudio -lsndfile -lsamplerate -lfftw3 + } + + Added: head/comms/jsdr/files/patch-make-x64_spectrum-viewer_spectrum-viewer.pro ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/jsdr/files/patch-make-x64_spectrum-viewer_spectrum-viewer.pro Thu Jul 25 18:53:30 2013 (r323661) @@ -0,0 +1,23 @@ +--- make-x64/spectrum-viewer/spectrum-viewer.pro.orig ++++ make-x64/spectrum-viewer/spectrum-viewer.pro +@@ -83,10 +83,16 @@ LIBS += -lsamplerate + #} + + #for fedora use the second set +-unix { INCLUDEPATH += /usr/include/qwt +- INCLUDEPATH += /usr/include/ +- INCLUDEPATH += /usr/local/include +- LIBS+= -lqwt -lusb-1.0 -lrt -lfftw3 -lsamplerate -ldl ++#unix { INCLUDEPATH += /usr/include/qwt ++# INCLUDEPATH += /usr/include/ ++# INCLUDEPATH += /usr/local/include ++# LIBS+= -lqwt -lusb-1.0 -lrt -lfftw3 -lsamplerate -ldl ++#} ++ ++#for FreeBSD use the third set ++unix { INCLUDEPATH += ${LOCALBASE}/include/qwt ++ INCLUDEPATH += ${LOCALBASE}/include ++ LIBS+= -lqwt -lusb -lrt -lfftw3 -lsamplerate + } + + Added: head/comms/jsdr/files/patch-make-x64_swreceiver_swreceiver.pro ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/jsdr/files/patch-make-x64_swreceiver_swreceiver.pro Thu Jul 25 18:53:30 2013 (r323661) @@ -0,0 +1,32 @@ +--- make-x64/swreceiver/swreceiver.pro.orig ++++ make-x64/swreceiver/swreceiver.pro +@@ -180,13 +180,21 @@ LIBS += -lwinmm + #} + + #for Fedora use the second set +-unix { INCLUDEPATH += /usr/include/qwt +- INCLUDEPATH += /usr/include/ +- INCLUDEPATH += /usr/local/include/ +- LIBS += -L/usr/lib64 +- LIBS += -L/lib64 +- LIBS += -L/usr/local/lib +- LIBS += -lqwt -lrt -lsndfile -lsamplerate -lportaudio -lusb-1.0 -lfftw3 -ldl +-} ++#unix { INCLUDEPATH += /usr/include/qwt ++# INCLUDEPATH += /usr/include/ ++# INCLUDEPATH += /usr/local/include/ ++# LIBS += -L/usr/lib64 ++# LIBS += -L/lib64 ++# LIBS += -L/usr/local/lib ++# LIBS += -lqwt -lrt -lsndfile -lsamplerate -lportaudio -lusb-1.0 -lfftw3 -ldl ++#} + ++#for FreeBSD use the third set ++unix { INCLUDEPATH += ${LOCALBASE}/include/qwt ++ INCLUDEPATH += ${LOCALBASE}/include/portaudio2 ++ INCLUDEPATH += ${LOCALBASE}/include ++ QMAKE_LIBDIR = ${LOCALBASE}/lib/portaudio2 ++ QMAKE_LIBDIR += ${LOCALBASE}/lib ++ LIBS += -lqwt -lrt -lsndfile -lsamplerate -lportaudio -lusb -lfftw3 ++} + Added: head/comms/jsdr/files/patch-righandling_dabstick-2_librtlsdr.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/jsdr/files/patch-righandling_dabstick-2_librtlsdr.c Thu Jul 25 18:53:30 2013 (r323661) @@ -0,0 +1,14 @@ +--- righandling/dabstick-2/librtlsdr.c.orig ++++ righandling/dabstick-2/librtlsdr.c +@@ -29,7 +29,11 @@ + + #define lmin(a, b) (((a) < (b)) ? (a) : (b)) + //#include ++#ifdef __FreeBSD__ ++#include ++#else + #include "libusb-1.0/libusb.h" ++#endif + + + /* Added: head/comms/jsdr/files/patch-righandling_pmsdr_pmsdr_usb.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/jsdr/files/patch-righandling_pmsdr_pmsdr_usb.h Thu Jul 25 18:53:30 2013 (r323661) @@ -0,0 +1,14 @@ +--- righandling/pmsdr/pmsdr_usb.h.orig ++++ righandling/pmsdr/pmsdr_usb.h +@@ -36,7 +36,11 @@ + //#ifdef __MINGW32__ + //#include + //#else ++#ifdef __FreeBSD__ ++#include ++#else + #include ++#endif + //#endif + + class RadioInterface; Added: head/comms/jsdr/files/patch-swreceiver_swdecoders_domino_dominodecoder.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/jsdr/files/patch-swreceiver_swdecoders_domino_dominodecoder.cpp Thu Jul 25 18:53:30 2013 (r323661) @@ -0,0 +1,15 @@ +--- swreceiver/swdecoders/domino/dominodecoder.cpp.orig ++++ swreceiver/swdecoders/domino/dominodecoder.cpp +@@ -39,8 +39,12 @@ + #include "gui.h" + #include "dominodecoder.h" + #ifndef __MINGW32__ ++#ifdef __FreeBSD__ ++#include ++#else + #include "alloca.h" + #endif ++#endif + + /* + * Standard Nasa coefficients for the viterbi decoder Added: head/comms/jsdr/files/patch-swreceiver_swdecoders_mfskdecoder_mfskdecoder.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/jsdr/files/patch-swreceiver_swdecoders_mfskdecoder_mfskdecoder.cpp Thu Jul 25 18:53:30 2013 (r323661) @@ -0,0 +1,15 @@ +--- swreceiver/swdecoders/mfskdecoder/mfskdecoder.cpp.orig ++++ swreceiver/swdecoders/mfskdecoder/mfskdecoder.cpp +@@ -32,8 +32,12 @@ + #include "mfskdecoder.h" + #include "oscillator.h" + #ifndef __MINGW32__ ++#ifdef __FreeBSD__ ++#include ++#else + #include "alloca.h" + #endif ++#endif + + #define BitIsContained(pat, bit) ((pat) & (1 << (mfskNumBits - (bit + 1)))) + /* Added: head/comms/jsdr/files/patch-utilities_decimator.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/jsdr/files/patch-utilities_decimator.cpp Thu Jul 25 18:53:30 2013 (r323661) @@ -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/jsdr/pkg-descr ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/jsdr/pkg-descr Thu Jul 25 18:53:30 2013 (r323661) @@ -0,0 +1,22 @@ +SDR-J (formerly Jsdr) is a suite of four programs provided under a +LGPL open source license for playing around with sdr (software +defined radio). The software can be used directly with the PM-SDR +kit and RTL2832U based dongles, and in the 32 bits Windows version +with other kits as well. + +The suite contains four programs: + +- a full blown "short wave" receiver, which provides tuning in the + range of 100K .. 165M using the PM-SDR (although above 55 M with + reduced performance) and from app 55 MHz to app 900 Mhz or above + using an RTL2832U based dongle. The receiver provides quite a number + of decoders for amateur modes. +- am/fm receiver covering the same frequency bands as the sw receiver, + however, with am bandwidths selectable, with fm mono and stereo + decoding as well as with rds decoding. +- spectrum viewer for use with the RTL2832U based dongles, showing + spectra of up to 3 Mhz bandwidth. +- mini receiver, a stripped version of the fm receiver, a gadget + for listening to WFM using DAB sticks. + +WWW: http://www.sdr-j.tk/