Patch for sdr-j/dabstick-radio

dabstick-radio-0.96.patch

diff -rupN dabstick-radio-0.96/dabreceiver-V2/CMakeLists.txt dabstick-radio-0.96-new/dabreceiver-V2/CMakeLists.txt
--- dabstick-radio-0.96/dabreceiver-V2/CMakeLists.txt	2013-08-09 12:31:18.000000000 +0200
+++ dabstick-radio-0.96-new/dabreceiver-V2/CMakeLists.txt	2014-05-30 07:15:34.247068084 +0200
@@ -1,4 +1,5 @@
 cmake_minimum_required( VERSION 2.6 )
+set ( CMAKE_MODULE_PATH ${CMAKE_ROOT}/Modules ${CMAKE_CURRENT_SOURCE_DIR}/cmake )
 set ( CMAKE_BUILD_TYPE Release )
 add_definitions ( -Wall )
 set (KJMP 1)		# flag for MP2 decoder
diff -rupN dabstick-radio-0.96/dabreceiver-V2/backend/fib_processor.cpp dabstick-radio-0.96-new/dabreceiver-V2/backend/fib_processor.cpp
--- dabstick-radio-0.96/dabreceiver-V2/backend/fib_processor.cpp	2013-07-31 12:21:27.000000000 +0200
+++ dabstick-radio-0.96-new/dabreceiver-V2/backend/fib_processor.cpp	2014-05-30 07:21:27.700155105 +0200
@@ -649,7 +649,7 @@ char		label [17];
 	   case 0:	// ensemble label
 	      SId	= getBits (d, 16, 16);
 	      offset	= 32;
-	      if (charSet == 0) {	// EBU Latin based repertoire
+	      if (charSet <= 16) {	// EBU Latin based repertoire
 	         for (i = 0; i < 16; i ++) {
 	            label [i] = getBits (d, offset + 8 * i, 8);
 	            addEnsembleChar (label [i], i);
@@ -666,7 +666,7 @@ char		label [17];
 	      SId	= getBits (d, 16, 16);
 	      offset	= 32;
 	      myIndex	= findServiceId (SId);
-	      if ((!myIndex -> serviceLabel. hasName) && (charSet == 0)) {
+	      if ((!myIndex -> serviceLabel. hasName) && (charSet <= 16)) {
 	         for (i = 0; i < 16; i ++) {
 	            label [i] = getBits (d, offset + 8 * i, 8);
 	         }
diff -rupN dabstick-radio-0.96/dabreceiver-V2/cmake/FindFFTW.cmake dabstick-radio-0.96-new/dabreceiver-V2/cmake/FindFFTW.cmake
--- dabstick-radio-0.96/dabreceiver-V2/cmake/FindFFTW.cmake	1970-01-01 01:00:00.000000000 +0100
+++ dabstick-radio-0.96-new/dabreceiver-V2/cmake/FindFFTW.cmake	2014-05-30 07:15:34.247068084 +0200
@@ -0,0 +1,33 @@
+# - Find FFTW
+# Find the native FFTW includes and library
+#
+#  FFTW_INCLUDES    - where to find fftw3.h
+#  FFTW_LIBRARIES   - List of libraries when using FFTW.
+#  FFTW_FOUND       - True if FFTW found.
+
+if (FFTW_INCLUDE_DIRS)
+  # Already in cache, be silent
+  set (FFTW_FIND_QUIETLY TRUE)
+endif (FFTW_INCLUDE_DIRS)
+
+find_path (FFTW_INCLUDE_DIR fftw3.h
+              HINTS
+                  ENV FFTW_ROOT
+              PATHS 
+              PATH_SUFFIXES
+                  include
+                  Include
+)
+list( APPEND FFTW_INCLUDE_DIRS ${FFTW_INCLUDE_DIR} )
+find_library (FFTW_LIBRARIES NAMES fftw3
+                HINTS ENV FFTW_ROOT
+                PATHS
+                PATH_SUFFIXES lib64 Lib64 lib Lib)
+
+message (STATUS ${FFTW_LIBRARIES} ${FFTW_INCLUDE_DIRS})
+# handle the QUIETLY and REQUIRED arguments and set FFTW_FOUND to TRUE if
+# all listed variables are TRUE
+include (FindPackageHandleStandardArgs)
+find_package_handle_standard_args (FFTW DEFAULT_MSG FFTW_LIBRARIES FFTW_INCLUDE_DIRS)
+
+mark_as_advanced (FFTW_LIBRARIES FFTW_INCLUDE_DIRS)
diff -rupN dabstick-radio-0.96/scopes-qwt6/scope.cpp dabstick-radio-0.96-new/scopes-qwt6/scope.cpp
--- dabstick-radio-0.96/scopes-qwt6/scope.cpp	2013-08-09 12:59:06.000000000 +0200
+++ dabstick-radio-0.96-new/scopes-qwt6/scope.cpp	2014-05-30 07:15:34.247068084 +0200
@@ -127,10 +127,10 @@ void	Scope::Display (double	*x_axis,
 	this	-> Displaysize	= displaysize;
 	plotgrid-> setCanvasBackground (Qt::white);
 	grid	= new QwtPlotGrid;
-	grid	-> setMajPen (QPen(Qt::gray, 0, Qt::DotLine));
+	grid	-> setMajorPen (QPen(Qt::gray, 0, Qt::DotLine));
 	grid	-> enableXMin (true);
 	grid	-> enableYMin (true);
-	grid	-> setMinPen (QPen(Qt::gray, 0 , Qt::DotLine));
+	grid	-> setMinorPen (QPen(Qt::gray, 0 , Qt::DotLine));
 	grid	-> attach (plotgrid);
 
 	SpectrumCurve	= new QwtPlotCurve ("");
diff -rupN dabstick-radio-0.96/scopes-qwt6/scope.h dabstick-radio-0.96-new/scopes-qwt6/scope.h
--- dabstick-radio-0.96/scopes-qwt6/scope.h	2013-08-09 12:58:10.000000000 +0200
+++ dabstick-radio-0.96-new/scopes-qwt6/scope.h	2014-05-30 07:15:34.247068084 +0200
@@ -47,7 +47,7 @@
 #include	<qwt_plot_zoomer.h>
 #include	<qwt_plot_panner.h>
 #include	<qwt_plot_layout.h>
-#include	<qwt_double_range.h>
+#include	<qwt_abstract_scale.h>
 #include	<qwt_compat.h>
 #include	"spectrogramdata.h"
 
diff -rupN dabstick-radio-0.96/scopes-qwt6/spectrogramdata.h dabstick-radio-0.96-new/scopes-qwt6/spectrogramdata.h
--- dabstick-radio-0.96/scopes-qwt6/spectrogramdata.h	2013-08-08 10:20:45.000000000 +0200
+++ dabstick-radio-0.96-new/scopes-qwt6/spectrogramdata.h	2014-05-30 07:15:34.247068084 +0200
@@ -54,7 +54,7 @@ virtual QwtDoubleInterval range() const
 #include	"jff-include.h"
 #include	<stdio.h>
 #include	<stdlib.h>
-#include	<qwt_double_range.h>
+#include	<qwt_abstract_scale.h>
 #include	<qwt_interval.h>
 #include	<qwt_raster_data.h>