spark: build stubbed out lcddisplay code to fix build

Origin commit data
------------------
Branch: ni/coolstream
Commit: eabeec110c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-02-11 (Sat, 11 Feb 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit

src/Makefile.am

@@ -29,6 +29,9 @@ endif
 if BOXTYPE_TRIPLE
 SUBDIRS += lcddisplay
 endif
+if BOXTYPE_SPARK
+SUBDIRS += lcddisplay
+endif
 
 if USE_TREMOR
 VORBISLIBS = @VORBISIDEC_LIBS@
@@ -114,16 +117,17 @@ drivertool_SOURCES = drivertool.c
 endif
 if USE_STB_HAL
 neutrino_LDADD += \
-	$(STB_HAL_LIB)/libstb-hal.a
+	$(STB_HAL_LIB)/libstb-hal.a \
+	$(top_builddir)/src/lcddisplay/liblcddisplay.a
 else
 if BOXTYPE_TRIPLE
 neutrino_LDADD += \
-	$(top_builddir)/lib/libtriple/libtriple.a
+	$(top_builddir)/lib/libtriple/libtriple.a \
-endif
-endif
-if BOXTYPE_TRIPLE
-neutrino_LDADD += \
-	@DIRECTFB_LIBS@ \
 	$(top_builddir)/src/lcddisplay/liblcddisplay.a
 endif
+endif
 
+if BOXTYPE_TRIPLE
+neutrino_LDADD += \
+	@DIRECTFB_LIBS@
+endif

src/driver/Makefile.am

@@ -49,6 +49,11 @@ libneutrino_driver_a_SOURCES += \
 	lcdd.cpp
 endif
 
+if BOXTYPE_SPARK
+libneutrino_driver_a_SOURCES += \
+	newclock.cpp \
+	lcdd.cpp
+endif
 if USE_STB_HAL
 INCLUDES += \
 	-I$(STB_HAL_INC) \

src/driver/lcdd.h

@@ -83,6 +83,9 @@ typedef enum
 #include <configfile.h>
 #include <pthread.h>
 
+#if HAVE_SPARK_HARDWARE
+#define HAVE_GENERIC_HARDWARE 1
+#endif
 #include <lcddisplay/fontrenderer.h>
 
 

src/driver/newclock.h

@@ -23,7 +23,9 @@
         Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-
+#ifdef HAVE_SPARK_HARDWARE
+#define HAVE_GENERIC_HARDWARE 1
+#endif
 #include <lcddisplay/lcddisplay.h>
 
 void InitNewClock();

src/global.h

@@ -47,7 +47,7 @@
 #include "driver/vfd.h"
 #include "driver/rfmod.h"
 #endif
-#if HAVE_TRIPLEDRAGON
+#if HAVE_TRIPLEDRAGON || HAVE_SPARK_HARDWARE
 #include "driver/lcdd.h"
 #define CVFD CLCD
 #endif

src/lcddisplay/lcddisplay.cpp

@@ -25,6 +25,9 @@
 */
 
 #include <config.h>
+#ifdef HAVE_SPARK_HARDWARE
+#define HAVE_GENERIC_HARDWARE 1
+#endif
 #include "lcddisplay.h"
 
 #include <png.h>

src/lcddisplay/lcddisplay.h

@@ -26,6 +26,9 @@
 	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#ifdef HAVE_SPARK_HARDWARE
+#define HAVE_GENERIC_HARDWARE 1
+#endif
 #ifdef HAVE_GENERIC_HARDWARE
 // dummy
 #define LCD_ROWS	8

src/neutrino.cpp

@@ -289,7 +289,7 @@ const lcd_setting_struct_t lcd_setting[SNeutrinoSettings::LCD_SETTING_COUNT] =
 	{"lcd_show_volume"      , DEFAULT_LCD_SHOW_VOLUME      },
 	{"lcd_autodimm"         , DEFAULT_LCD_AUTODIMM         },
 	{"lcd_deepbrightness"   , DEFAULT_VFD_STANDBYBRIGHTNESS }
-#if HAVE_TRIPLEDRAGON
+#if HAVE_TRIPLEDRAGON || USE_STB_HAL
 	,{ "lcd_epgmode"        , 0 /*DEFAULT_LCD_EPGMODE*/ }
 #endif
 };

src/system/settings.h

@@ -491,7 +491,7 @@ struct SNeutrinoSettings
 		LCD_SHOW_VOLUME        ,
 		LCD_AUTODIMM           ,
 		LCD_DEEPSTANDBY_BRIGHTNESS,
-#if HAVE_TRIPLEDRAGON
+#if HAVE_TRIPLEDRAGON || HAVE_SPARK_HARDWARE
 		LCD_EPGMODE            ,
 #endif
 		LCD_SETTING_COUNT