Date: Thu, 9 May 2013 12:48:13 +0000 (UTC) From: Juergen Lock <nox@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r317737 - in head/comms/dabstick-radio: . files Message-ID: <201305091248.r49CmDgi063800@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: nox Date: Thu May 9 12:48:12 2013 New Revision: 317737 URL: http://svnweb.freebsd.org/changeset/ports/317737 Log: - Update to 0.91 . - Add patch to workaround occasional crashes when tuning to channels. Added: head/comms/dabstick-radio/files/patch-dabreceiver-V2_gui.cpp (contents, props changed) Deleted: head/comms/dabstick-radio/files/patch-filters_fir-filters.cpp head/comms/dabstick-radio/files/patch-filters_iir-filters.cpp head/comms/dabstick-radio/files/patch-jff-include.h head/comms/dabstick-radio/files/patch-utilities_decimator.cpp Modified: head/comms/dabstick-radio/Makefile head/comms/dabstick-radio/distinfo head/comms/dabstick-radio/files/patch-dabreceiver-V2_dabreceiver.pro head/comms/dabstick-radio/files/patch-fmreceiver-dab_fmreceiver.pro Modified: head/comms/dabstick-radio/Makefile ============================================================================== --- head/comms/dabstick-radio/Makefile Thu May 9 12:06:38 2013 (r317736) +++ head/comms/dabstick-radio/Makefile Thu May 9 12:48:12 2013 (r317737) @@ -2,10 +2,9 @@ # $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 @@ -25,6 +24,7 @@ USE_QT4= gui qt3support qmake_build moc_ FFMPEG_SUFFIX= 1 +WRKSRC= ${WRKDIR}/${PORTNAME} QMAKE_DABSTICK= ${QMAKE} -unix PREFIX=${PREFIX} -o MAKE_ENV+= FFMPEG_SUFFIX=${FFMPEG_SUFFIX} MAKE_JOBS_SAFE= yes Modified: head/comms/dabstick-radio/distinfo ============================================================================== --- head/comms/dabstick-radio/distinfo Thu May 9 12:06:38 2013 (r317736) +++ head/comms/dabstick-radio/distinfo Thu May 9 12:48:12 2013 (r317737) @@ -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 Modified: head/comms/dabstick-radio/files/patch-dabreceiver-V2_dabreceiver.pro ============================================================================== --- head/comms/dabstick-radio/files/patch-dabreceiver-V2_dabreceiver.pro Thu May 9 12:06:38 2013 (r317736) +++ head/comms/dabstick-radio/files/patch-dabreceiver-V2_dabreceiver.pro Thu May 9 12:48:12 2013 (r317737) @@ -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 ++} Added: head/comms/dabstick-radio/files/patch-dabreceiver-V2_gui.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/dabstick-radio/files/patch-dabreceiver-V2_gui.cpp Thu May 9 12:48:12 2013 (r317737) @@ -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]); + } Modified: head/comms/dabstick-radio/files/patch-fmreceiver-dab_fmreceiver.pro ============================================================================== --- head/comms/dabstick-radio/files/patch-fmreceiver-dab_fmreceiver.pro Thu May 9 12:06:38 2013 (r317736) +++ head/comms/dabstick-radio/files/patch-fmreceiver-dab_fmreceiver.pro Thu May 9 12:48:12 2013 (r317737) @@ -1,9 +1,17 @@ --- 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 @@ -12,21 +20,29 @@ +# 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 - } - - ++} + #
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305091248.r49CmDgi063800>