- Update to 0.91 .

- Add patch to workaround occasional crashes when tuning to channels.

9 files changed, 93 insertions, 101 deletions

diff --git a/comms/dabstick-radio/Makefile b/comms/dabstick-radio/Makefile
index e6c1468328e7..f5f47e24b249 100644
--- a/comms/dabstick-radio/Makefile
+++ b/comms/dabstick-radio/Makefile
@@ -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_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 abc54f4debd2..c26768764e31 100644
--- a/comms/dabstick-radio/distinfo
+++ b/comms/dabstick-radio/distinfo
@@ -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
diff --git a/comms/dabstick-radio/files/patch-dabreceiver-V2_dabreceiver.pro b/comms/dabstick-radio/files/patch-dabreceiver-V2_dabreceiver.pro
index 53461a5ad929..ea2dee922d22 100644
--- a/comms/dabstick-radio/files/patch-dabreceiver-V2_dabreceiver.pro
+++ b/comms/dabstick-radio/files/patch-dabreceiver-V2_dabreceiver.pro
@@ -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
++}
  
diff --git a/comms/dabstick-radio/files/patch-dabreceiver-V2_gui.cpp b/comms/dabstick-radio/files/patch-dabreceiver-V2_gui.cpp
new file mode 100644
index 000000000000..a0386ace8100
--- /dev/null
+++ b/comms/dabstick-radio/files/patch-dabreceiver-V2_gui.cpp
@@ -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]);
+ }
diff --git a/comms/dabstick-radio/files/patch-filters_fir-filters.cpp b/comms/dabstick-radio/files/patch-filters_fir-filters.cpp
deleted file mode 100644
index ca518d9de964..000000000000
--- a/comms/dabstick-radio/files/patch-filters_fir-filters.cpp
+++ /dev/null
@@ -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	<stdlib.h>
-+#else
- #include	"alloca.h"
- #endif
-+#endif
- 
- //===================================================================
- //=====================================================================
diff --git a/comms/dabstick-radio/files/patch-filters_iir-filters.cpp b/comms/dabstick-radio/files/patch-filters_iir-filters.cpp
deleted file mode 100644
index d234b789d69e..000000000000
--- a/comms/dabstick-radio/files/patch-filters_iir-filters.cpp
+++ /dev/null
@@ -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	<stdlib.h>
-+#else
- #include	"alloca.h"
- #endif
-+#endif
- 
- #define	MAXORDER	0176
- 
diff --git a/comms/dabstick-radio/files/patch-fmreceiver-dab_fmreceiver.pro b/comms/dabstick-radio/files/patch-fmreceiver-dab_fmreceiver.pro
index 884cf70e9e4f..50b16e281552 100644
--- a/comms/dabstick-radio/files/patch-fmreceiver-dab_fmreceiver.pro
+++ b/comms/dabstick-radio/files/patch-fmreceiver-dab_fmreceiver.pro
@@ -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
- }
- 
- 
++}
+ #
diff --git a/comms/dabstick-radio/files/patch-jff-include.h b/comms/dabstick-radio/files/patch-jff-include.h
deleted file mode 100644
index 5a2884382853..000000000000
--- a/comms/dabstick-radio/files/patch-jff-include.h
+++ /dev/null
@@ -1,21 +0,0 @@
---- jff-include.h.orig
-+++ jff-include.h
-@@ -32,12 +32,18 @@
- #include	<complex>
- #include	<stdint.h>
- 
-+#ifdef __FreeBSD__
-+#include	<stdlib.h>
-+#else
- #include	<malloc.h>
-+#endif
- 
- #ifdef __MINGW32__
- #include	"windows.h"
- #else
-+#ifndef __FreeBSD__
- #include	"alloca.h"
-+#endif
- #include	"dlfcn.h"
- typedef	void	*HINSTANCE;
- #endif
diff --git a/comms/dabstick-radio/files/patch-utilities_decimator.cpp b/comms/dabstick-radio/files/patch-utilities_decimator.cpp
deleted file mode 100644
index 5b67bfccf3cc..000000000000
--- a/comms/dabstick-radio/files/patch-utilities_decimator.cpp
+++ /dev/null
@@ -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;