From b014593565b19532bf8915cc097aec26ebfd92ab Mon Sep 17 00:00:00 2001 From: Juergen Lock Date: Sat, 11 May 2013 14:42:54 +0000 Subject: [PATCH] Update to 0.92 . --- comms/dabstick-radio/Makefile | 4 +--- comms/dabstick-radio/distinfo | 4 ++-- .../files/patch-dabreceiver-V2_dabreceiver.pro | 3 ++- .../dabstick-radio/files/patch-dabreceiver-V2_gui.cpp | 2 +- .../files/patch-fmreceiver-dab_fmreceiver.pro | 11 ++++++----- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/comms/dabstick-radio/Makefile b/comms/dabstick-radio/Makefile index f5f47e24b249..a9547226e16a 100644 --- a/comms/dabstick-radio/Makefile +++ b/comms/dabstick-radio/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= dabstick-radio -PORTVERSION= 0.91 +PORTVERSION= 0.92 CATEGORIES= comms audio hamradio MASTER_SITES= http://www.sdr-j.tk/ EXTRACT_SUFX= .tgz @@ -15,7 +15,6 @@ 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 @@ -24,7 +23,6 @@ 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 diff --git a/comms/dabstick-radio/distinfo b/comms/dabstick-radio/distinfo index c26768764e31..b64a9686abd9 100644 --- a/comms/dabstick-radio/distinfo +++ b/comms/dabstick-radio/distinfo @@ -1,2 +1,2 @@ -SHA256 (dabstick-radio-0.91.tgz) = c44a5e76026717d872e936eeac60b0f093b2854bddc11cc8b79141bce2745ce0 -SIZE (dabstick-radio-0.91.tgz) = 508880 +SHA256 (dabstick-radio-0.92.tgz) = 66f263e1971718f8e44471a02aa126dd7ae8bef644dec8bc1e9a44f819e61724 +SIZE (dabstick-radio-0.92.tgz) = 524169 diff --git a/comms/dabstick-radio/files/patch-dabreceiver-V2_dabreceiver.pro b/comms/dabstick-radio/files/patch-dabreceiver-V2_dabreceiver.pro index ea2dee922d22..f1e9a77b01c8 100644 --- a/comms/dabstick-radio/files/patch-dabreceiver-V2_dabreceiver.pro +++ b/comms/dabstick-radio/files/patch-dabreceiver-V2_dabreceiver.pro @@ -1,6 +1,6 @@ --- dabreceiver-V2/dabreceiver.pro.orig +++ dabreceiver-V2/dabreceiver.pro -@@ -138,38 +138,39 @@ LIBS += -lfaad +@@ -138,39 +138,39 @@ LIBS += -lfaad #} #for fedora use the second set @@ -32,6 +32,7 @@ ##for FreeBSD use the third set (Thanks to Juergen Lock) -#unix { +-# QMAKE_CXXFLAGS += -D__FREEBSD__ -# HEADERS += ../input/dabstick.h -# SOURCES += ../input/dabstick.cpp -# INCLUDEPATH += ${LOCALBASE}/include/qwt diff --git a/comms/dabstick-radio/files/patch-dabreceiver-V2_gui.cpp b/comms/dabstick-radio/files/patch-dabreceiver-V2_gui.cpp index a0386ace8100..57e616292c52 100644 --- a/comms/dabstick-radio/files/patch-dabreceiver-V2_gui.cpp +++ b/comms/dabstick-radio/files/patch-dabreceiver-V2_gui.cpp @@ -1,6 +1,6 @@ --- dabreceiver-V2/gui.cpp.orig +++ dabreceiver-V2/gui.cpp -@@ -646,6 +646,12 @@ QString a = ensemble. data (s, Qt::Displ +@@ -661,6 +661,12 @@ QString a = ensemble. data (s, Qt::Displ break; } diff --git a/comms/dabstick-radio/files/patch-fmreceiver-dab_fmreceiver.pro b/comms/dabstick-radio/files/patch-fmreceiver-dab_fmreceiver.pro index 50b16e281552..49d689a44cc4 100644 --- a/comms/dabstick-radio/files/patch-fmreceiver-dab_fmreceiver.pro +++ b/comms/dabstick-radio/files/patch-fmreceiver-dab_fmreceiver.pro @@ -1,6 +1,6 @@ --- fmreceiver-dab/fmreceiver.pro.orig +++ fmreceiver-dab/fmreceiver.pro -@@ -119,25 +119,26 @@ LIBS += -lstdc++ +@@ -121,26 +121,26 @@ LIBS += -lstdc++ #} #for fedora use the second set @@ -10,7 +10,7 @@ - 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 +- LIBS+= -lqwt5-qt4 -lusb-1.0 -lrt -lportaudio -lfftw3 -lrtlsdr -ldl -} +#unix { +# HEADERS += ../input/dabstick.h @@ -18,11 +18,12 @@ +# 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 ++# LIBS+= -lqwt5-qt4 -lusb-1.0 -lrt -lportaudio -lfftw3 -lrtlsdr -ldl +#} #for FreeBSD use the third set (thanks Juergen Lock) -#unix { +-# QMAKE_CXXFLAGS += -D__FREEBSD__ -# HEADERS += ../input/dabstick.h -# SOURCES += ../input/dabstick.cpp -# INCLUDEPATH += ${LOCALBASE}/include/qwt @@ -31,7 +32,7 @@ -# INCLUDEPATH += /usr/include/ -# QMAKE_LIBDIR = ${LOCALBASE}/lib/portaudio2 -# QMAKE_LIBDIR += ${LOCALBASE}/lib --# LIBS+= -lqwt -lusb -lrt -lportaudio -lsndfile -lsamplerate -lfftw3 -lrtlsdr +-# LIBS+= -lqwt -lusb -lrt -lportaudio -lfftw3f -lrtlsdr -#} +unix { + QMAKE_CXXFLAGS += -D__FREEBSD__ @@ -43,6 +44,6 @@ + INCLUDEPATH += /usr/include/ + QMAKE_LIBDIR = ${LOCALBASE}/lib/portaudio2 + QMAKE_LIBDIR += ${LOCALBASE}/lib -+ LIBS+= -lqwt -lusb -lrt -lportaudio -lsndfile -lsamplerate -lfftw3 -lrtlsdr ++ LIBS+= -lqwt -lusb -lrt -lportaudio -lfftw3 -lrtlsdr +} #