- Update to 0.95 .

- The DAB(+) receiver app now needs MMX and SSE2 so might not run on
  some old i386 systems, on the other hand it uses considerably
  less CPU than previous versions.
- Add spectrum-viewer app.
- More release notes in %%PREFIX%%/share/doc/dabstick-radio/README-0.95 .

5 files changed, 106 insertions, 54 deletions

diff --git a/comms/dabstick-radio/files/patch-dabreceiver-V2_backend_mm_malloc.h b/comms/dabstick-radio/files/patch-dabreceiver-V2_backend_mm_malloc.h
new file mode 100644
index 000000000000..e4d7342a2ecf
--- /dev/null
+++ b/comms/dabstick-radio/files/patch-dabreceiver-V2_backend_mm_malloc.h
@@ -0,0 +1,12 @@
+--- dabreceiver-V2/backend/mm_malloc.h.orig
++++ dabreceiver-V2/backend/mm_malloc.h
+@@ -40,7 +40,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ #if defined(_WIN32) || defined(_WIN64)
+ #define MALLOC(a) _mm_malloc(a, 16)
+ #else
++#ifndef __FreeBSD__
+ #include <malloc.h>
++#endif
+ #define MALLOC(a) memalign(16, a)
+ #endif
+ 
diff --git a/comms/dabstick-radio/files/patch-dabreceiver-V2_dabreceiver.pro b/comms/dabstick-radio/files/patch-dabreceiver-V2_dabreceiver.pro
index f1e9a77b01c8..1582ed752532 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,39 +138,39 @@ LIBS += -lfaad
+@@ -147,40 +147,41 @@ LIBS += -lsndfile
  #}
  
  #for fedora use the second set
@@ -10,30 +10,21 @@
 -	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 -lfftw3  -lrtlsdr -ldl -lz
- #uncomment the following line when using the libav package for ffmpeg
- #rather than the "built-in" code for KJMP
+-#	LIBS+=  -lqwt5-qt4 -lusb-1.0 -lrt -lportaudio  -lsndfile -lfftw3f  -lrtlsdr -ldl -lz
+-	LIBS+=  -lqwt5-qt4 -lusb-1.0 -lrt -lportaudio  -lsndfile -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
+-#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 (Thanks to Juergen Lock)
--#unix {
+-
+-##for FreeBSD use the third set (Thanks to Juergen Lock)
+ #unix {
 -#	QMAKE_CXXFLAGS += -D__FREEBSD__
--#	HEADERS += ../input/dabstick.h
+ #	HEADERS += ../input/dabstick.h
 -#	SOURCES += ../input/dabstick.cpp
 -#	INCLUDEPATH += ${LOCALBASE}/include/qwt
 -#	INCLUDEPATH += ${LOCALBASE}/include/portaudio2
@@ -43,9 +34,27 @@
 -#	QMAKE_LIBDIR = ${LOCALBASE}/lib/portaudio2
 -#	QMAKE_LIBDIR += ${LOCALBASE}/lib/ffmpeg${FFMPEG_SUFFIX}
 -#	QMAKE_LIBDIR += ${LOCALBASE}/lib
--#	LIBS+=  -lqwt -lusb -lrt -lportaudio -lfftw3  -lrtlsdr -lz
+-#	LIBS+=  -lqwt -lusb -lrt -lportaudio  -lsndfile -lfftw3  -lrtlsdr -lz
++#	SOURCES	+= ../input/dabstick.cpp
++#	INCLUDEPATH += /usr/include/qwt5-qt4
++#	INCLUDEPATH += /usr/include/ 
++#	INCLUDEPATH += /usr/include/ffmpeg
++##	LIBS+=  -lqwt5-qt4 -lusb-1.0 -lrt -lportaudio  -lsndfile -lfftw3f  -lrtlsdr -ldl -lz
++#	LIBS+=  -lqwt5-qt4 -lusb-1.0 -lrt -lportaudio  -lsndfile -lfftw3  -lrtlsdr -ldl -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}
++##rather than the "built-in" code for KJMP
++#	LIBS+= -lavcodec -lavdevice -lavutil -lavformat -lswresample -lswscale -lavfilter
+ ##uncomment the following line when using the faad library
+ #	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 (Thanks to Juergen Lock)
 +unix {
-+	QMAKE_CXXFLAGS += -D__FREEBSD__
++	QMAKE_CXXFLAGS += -D__FREEBSD__ -mmmx -msse2
++	QMAKE_CFLAGS += -D__FREEBSD__ -mmmx -msse2
 +	HEADERS += ../input/dabstick.h
 +	SOURCES += ../input/dabstick.cpp
 +	INCLUDEPATH += ${LOCALBASE}/include/qwt
@@ -56,13 +65,10 @@
 +	QMAKE_LIBDIR = ${LOCALBASE}/lib/portaudio2
 +	QMAKE_LIBDIR += ${LOCALBASE}/lib/ffmpeg${FFMPEG_SUFFIX}
 +	QMAKE_LIBDIR += ${LOCALBASE}/lib
-+	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+=  -lqwt -lusb -lrt -lportaudio  -lsndfile -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}
- ##uncomment the following line when using the faad library
--#	LIBS += -lfaad
--#}
++#uncomment the following line when using the faad library
 +	LIBS += -lfaad
 +}
- 
++
diff --git a/comms/dabstick-radio/files/patch-dabreceiver-V2_gui.cpp b/comms/dabstick-radio/files/patch-dabreceiver-V2_gui.cpp
deleted file mode 100644
index 57e616292c52..000000000000
--- a/comms/dabstick-radio/files/patch-dabreceiver-V2_gui.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
---- dabreceiver-V2/gui.cpp.orig
-+++ dabreceiver-V2/gui.cpp
-@@ -661,6 +661,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-fmreceiver-dab_fmreceiver.pro b/comms/dabstick-radio/files/patch-fmreceiver-dab_fmreceiver.pro
index 49d689a44cc4..1fb15e0c5bf5 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
-@@ -121,26 +121,26 @@ LIBS += -lstdc++
+@@ -121,26 +121,27 @@ 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 -lfftw3 -lrtlsdr -ldl
+-	LIBS+=  -lqwt5-qt4 -lusb-1.0 -lrt -lportaudio -lsndfile -lfftw3 -lrtlsdr -ldl
 -}
 +#unix { 
 +#	HEADERS += ../input/dabstick.h
@@ -18,7 +18,7 @@
 +#	INCLUDEPATH += /usr/include/qwt5-qt4
 +#	INCLUDEPATH += /usr/local/include
 +#	INCLUDEPATH += /usr/include/ 
-+#	LIBS+=  -lqwt5-qt4 -lusb-1.0 -lrt -lportaudio -lfftw3 -lrtlsdr -ldl
++#	LIBS+=  -lqwt5-qt4 -lusb-1.0 -lrt -lportaudio -lsndfile -lfftw3 -lrtlsdr -ldl
 +#}
  
  #for FreeBSD use the third set (thanks Juergen Lock)
@@ -32,18 +32,19 @@
 -#	INCLUDEPATH += /usr/include/
 -#	QMAKE_LIBDIR = ${LOCALBASE}/lib/portaudio2
 -#	QMAKE_LIBDIR += ${LOCALBASE}/lib
--#	LIBS+=  -lqwt -lusb -lrt -lportaudio -lfftw3f -lrtlsdr
+-#	LIBS+=  -lqwt -lusb -lrt -lportaudio -lsndfile -lfftw3 -lrtlsdr
 -#}
 +unix {
-+	QMAKE_CXXFLAGS += -D__FREEBSD__
-+        HEADERS += ../input/dabstick.h
-+        SOURCES += ../input/dabstick.cpp
++	QMAKE_CXXFLAGS += -D__FREEBSD__ -mmmx -msse2
++	QMAKE_CFLAGS += -D__FREEBSD__ -mmmx -msse2
++	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/
 +	QMAKE_LIBDIR = ${LOCALBASE}/lib/portaudio2
 +	QMAKE_LIBDIR += ${LOCALBASE}/lib
-+	LIBS+=  -lqwt -lusb -lrt -lportaudio -lfftw3 -lrtlsdr
++	LIBS+=  -lqwt -lusb -lrt -lportaudio -lsndfile -lfftw3 -lrtlsdr
 +}
  #
diff --git a/comms/dabstick-radio/files/patch-spectrum-viewer_spectrum-viewer.pro b/comms/dabstick-radio/files/patch-spectrum-viewer_spectrum-viewer.pro
new file mode 100644
index 000000000000..35f6d41eca81
--- /dev/null
+++ b/comms/dabstick-radio/files/patch-spectrum-viewer_spectrum-viewer.pro
@@ -0,0 +1,48 @@
+--- spectrum-viewer/spectrum-viewer.pro.orig
++++ spectrum-viewer/spectrum-viewer.pro
+@@ -63,24 +63,27 @@ LIBS += -lsamplerate
+ #}
+ 
+ #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/local/include
+-	LIBS+=  -lqwt5-qt4 -lusb-1.0 -lrt -lfftw3 -lrtlsdr -ldl
+-}
++#unix { 
++#	HEADERS	+= ../input/dabstick.h
++#	SOURCES	+= ../input/dabstick.cpp
++#	INCLUDEPATH += /usr/include/qwt5-qt4
++#	INCLUDEPATH += /usr/include/ 
++#	INCLUDEPATH += /usr/local/include
++#	LIBS+=  -lqwt5-qt4 -lusb-1.0 -lrt -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
+-#	INCLUDEPATH += ${LOCALBASE}/include
+-#	INCLUDEPATH += /usr/include/
+-#	QMAKE_LIBDIR += ${LOCALBASE}/lib
+-#	LIBS+=  -lqwt -lusb -lrt -lfftw3 -lrtlsdr
+-#}
++unix {
++	QMAKE_CXXFLAGS += -D__FREEBSD__ -mmmx -msse2
++	QMAKE_CFLAGS += -D__FREEBSD__ -mmmx -msse2
++	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 -lfftw3 -lrtlsdr
++}
+ #