Index: head/comms/dabstick-radio/Makefile =================================================================== --- head/comms/dabstick-radio/Makefile (revision 317736) +++ head/comms/dabstick-radio/Makefile (revision 317737) @@ -1,62 +1,62 @@ # Created by: Juergen Lock # $FreeBSD$ PORTNAME= dabstick-radio -PORTVERSION= 0.1 +PORTVERSION= 0.91 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 +WRKSRC= ${WRKDIR}/${PORTNAME} 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 Index: head/comms/dabstick-radio/distinfo =================================================================== --- head/comms/dabstick-radio/distinfo (revision 317736) +++ head/comms/dabstick-radio/distinfo (revision 317737) @@ -1,2 +1,2 @@ -SHA256 (dabstick-radio.tgz) = 5270f245abe653e714c2559848efa092d4deaee09626b2f5d8c93d7de80280e1 -SIZE (dabstick-radio.tgz) = 506372 +SHA256 (dabstick-radio-0.91.tgz) = c44a5e76026717d872e936eeac60b0f093b2854bddc11cc8b79141bce2745ce0 +SIZE (dabstick-radio-0.91.tgz) = 508880 Index: head/comms/dabstick-radio/files/patch-filters_fir-filters.cpp =================================================================== --- head/comms/dabstick-radio/files/patch-filters_fir-filters.cpp (revision 317736) +++ head/comms/dabstick-radio/files/patch-filters_fir-filters.cpp (nonexistent) @@ -1,15 +0,0 @@ ---- 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 - - //=================================================================== - //===================================================================== Property changes on: head/comms/dabstick-radio/files/patch-filters_fir-filters.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/comms/dabstick-radio/files/patch-filters_iir-filters.cpp =================================================================== --- head/comms/dabstick-radio/files/patch-filters_iir-filters.cpp (revision 317736) +++ head/comms/dabstick-radio/files/patch-filters_iir-filters.cpp (nonexistent) @@ -1,15 +0,0 @@ ---- 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 - Property changes on: head/comms/dabstick-radio/files/patch-filters_iir-filters.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/comms/dabstick-radio/files/patch-jff-include.h =================================================================== --- head/comms/dabstick-radio/files/patch-jff-include.h (revision 317736) +++ head/comms/dabstick-radio/files/patch-jff-include.h (nonexistent) @@ -1,21 +0,0 @@ ---- 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 Property changes on: head/comms/dabstick-radio/files/patch-jff-include.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/comms/dabstick-radio/files/patch-utilities_decimator.cpp =================================================================== --- head/comms/dabstick-radio/files/patch-utilities_decimator.cpp (revision 317736) +++ head/comms/dabstick-radio/files/patch-utilities_decimator.cpp (nonexistent) @@ -1,13 +0,0 @@ ---- 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; Property changes on: head/comms/dabstick-radio/files/patch-utilities_decimator.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/comms/dabstick-radio/files/patch-dabreceiver-V2_dabreceiver.pro =================================================================== --- head/comms/dabstick-radio/files/patch-dabreceiver-V2_dabreceiver.pro (revision 317736) +++ head/comms/dabstick-radio/files/patch-dabreceiver-V2_dabreceiver.pro (revision 317737) @@ -1,42 +1,67 @@ --- dabreceiver-V2/dabreceiver.pro.orig +++ dabreceiver-V2/dabreceiver.pro -@@ -135,15 +135,35 @@ LIBS += -lfaad +@@ -138,38 +138,39 @@ 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 -lfftw3 -lrtlsdr -ldl -lz +#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+= -lqwt5-qt4 -lusb-1.0 -lrt -lportaudio -lfftw3 -lrtlsdr -ldl -lz + #uncomment the following line when using the libav package for ffmpeg + #rather than the "built-in" code for KJMP +- LIBS+= -lavcodec -lavdevice -lavutil -lavformat -lswresample -lswscale -lavfilter +# LIBS+= -lavcodec -lavdevice -lavutil -lavformat -lswresample -lswscale -lavfilter -+##uncomment the following line when using the faad library + #uncomment the following line when using the faad library +- LIBS += -lfaad +# LIBS += -lfaad -+# + #Normal operation under Linux is to uncomment both lines. + #If otherwise: also adjust the define(s) in dab-constants.h +-} +#} -+ -+#for FreeBSD use the third set - unix { - HEADERS += ../input/dabstick.h - SOURCES += ../input/dabstick.cpp -- INCLUDEPATH += /usr/include/qwt5-qt4 + + ##for FreeBSD use the third set (Thanks to Juergen Lock) +-#unix { +-# HEADERS += ../input/dabstick.h +-# SOURCES += ../input/dabstick.cpp +-# INCLUDEPATH += ${LOCALBASE}/include/qwt +-# INCLUDEPATH += ${LOCALBASE}/include/portaudio2 +-# INCLUDEPATH += ${LOCALBASE}/include/ffmpeg1 +-# INCLUDEPATH += ${LOCALBASE}/include +-# INCLUDEPATH += /usr/include/ +-# QMAKE_LIBDIR = ${LOCALBASE}/lib/portaudio2 +-# QMAKE_LIBDIR += ${LOCALBASE}/lib/ffmpeg${FFMPEG_SUFFIX} +-# QMAKE_LIBDIR += ${LOCALBASE}/lib +-# LIBS+= -lqwt -lusb -lrt -lportaudio -lfftw3 -lrtlsdr -lz ++unix { ++ QMAKE_CXXFLAGS += -D__FREEBSD__ ++ HEADERS += ../input/dabstick.h ++ SOURCES += ../input/dabstick.cpp + 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 ++ INCLUDEPATH += /usr/include/ + 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+= -lqwt -lusb -lrt -lportaudio -lfftw3 -lrtlsdr -lz + ##uncomment the following line when using the libav package for ffmpeg +-# LIBS+= -lavcodec${FFMPEG_SUFFIX} -lavdevice${FFMPEG_SUFFIX} -lavutil${FFMPEG_SUFFIX} -lavformat${FFMPEG_SUFFIX} -lswresample${FFMPEG_SUFFIX} -lswscale${FFMPEG_SUFFIX} -lavfilter${FFMPEG_SUFFIX} + 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 + ##uncomment the following line when using the faad library +-# LIBS += -lfaad +-#} ++ LIBS += -lfaad ++} Index: head/comms/dabstick-radio/files/patch-dabreceiver-V2_gui.cpp =================================================================== --- head/comms/dabstick-radio/files/patch-dabreceiver-V2_gui.cpp (nonexistent) +++ head/comms/dabstick-radio/files/patch-dabreceiver-V2_gui.cpp (revision 317737) @@ -0,0 +1,15 @@ +--- dabreceiver-V2/gui.cpp.orig ++++ dabreceiver-V2/gui.cpp +@@ -646,6 +646,12 @@ QString a = ensemble. data (s, Qt::Displ + break; + } + ++#if 1 ++ if (language < 0 || language > sizeof(table9)/sizeof(*table9)) ++ language = 0; ++ if (type < 0 || type > sizeof(table12)/sizeof(*table12)) ++ type = 0; ++#endif + nameofLanguage -> setText (table9 [language]); + programType -> setText (table12 [type]); + } Property changes on: head/comms/dabstick-radio/files/patch-dabreceiver-V2_gui.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/comms/dabstick-radio/files/patch-fmreceiver-dab_fmreceiver.pro =================================================================== --- head/comms/dabstick-radio/files/patch-fmreceiver-dab_fmreceiver.pro (revision 317736) +++ head/comms/dabstick-radio/files/patch-fmreceiver-dab_fmreceiver.pro (revision 317737) @@ -1,32 +1,48 @@ --- fmreceiver-dab/fmreceiver.pro.orig +++ fmreceiver-dab/fmreceiver.pro -@@ -121,13 +121,26 @@ LIBS += -lstdc++ +@@ -119,25 +119,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 +-} +#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 + + #for FreeBSD use the third set (thanks Juergen Lock) +-#unix { +-# HEADERS += ../input/dabstick.h +-# SOURCES += ../input/dabstick.cpp +-# INCLUDEPATH += ${LOCALBASE}/include/qwt +-# INCLUDEPATH += ${LOCALBASE}/include/portaudio2 +-# INCLUDEPATH += ${LOCALBASE}/include +-# INCLUDEPATH += /usr/include/ +-# QMAKE_LIBDIR = ${LOCALBASE}/lib/portaudio2 +-# QMAKE_LIBDIR += ${LOCALBASE}/lib +-# LIBS+= -lqwt -lusb -lrt -lportaudio -lsndfile -lsamplerate -lfftw3 -lrtlsdr +-#} ++unix { ++ QMAKE_CXXFLAGS += -D__FREEBSD__ ++ HEADERS += ../input/dabstick.h ++ SOURCES += ../input/dabstick.cpp + INCLUDEPATH += ${LOCALBASE}/include/qwt -+ INCLUDEPATH += ${LOCALBASE}/include/portaudio2 ++ INCLUDEPATH += ${LOCALBASE}/include/portaudio2 + INCLUDEPATH += ${LOCALBASE}/include - INCLUDEPATH += /usr/include/ -- LIBS+= -lqwt5-qt4 -lusb-1.0 -lrt -lportaudio -lsndfile -lsamplerate -lfftw3 -lrtlsdr -ldl ++ INCLUDEPATH += /usr/include/ + QMAKE_LIBDIR = ${LOCALBASE}/lib/portaudio2 + QMAKE_LIBDIR += ${LOCALBASE}/lib + LIBS+= -lqwt -lusb -lrt -lportaudio -lsndfile -lsamplerate -lfftw3 -lrtlsdr - } - - ++} + #