Adapt neutrino-mp for CST hardware part #1

- Fix compile for cst hardware
 - Code tested on kronos and apollo hardware, is ok
 - On Nevis hardware will be compiled, but not working
 (no frontend found, segfault)


Origin commit data
------------------
Branch: ni/coolstream
Commit: 403d02ec2b
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-15 (Fri, 15 Jan 2016)

Origin message was:
------------------
Adapt neutrino-mp for CST hardware part #1

 - Fix compile for cst hardware
 - Code tested on kronos and apollo hardware, is ok
 - On Nevis hardware will be compiled, but not working
  (no frontend found, segfault)


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

configure.ac

@@ -262,10 +262,10 @@ if test "$BOXTYPE" = "coolstream"; then
 if test -e ${srcdir}/lib/libcoolstream/nevis_ir.h; then
 	AC_DEFINE(HAVE_COOLSTREAM_NEVIS_IR_H,1,[Define to 1 if you have the <nevis_ir.h> header file.])
 fi
-HWLIB_CFLAGS='-I$(top_srcdir)/lib/libcoolstream'
+HWLIB_CFLAGS='-I$(top_srcdir)/lib/libcoolstream -I$(top_srcdir)/src/zapit/include/private'
 
 if test "$BOXMODEL" = "apollo"; then
-HWLIB_CFLAGS='-I$(top_srcdir)/lib/libcoolstream2 -I$(top_srcdir)/src/zapit/include/private'
+HWLIB_CFLAGS='-I$(top_srcdir)/lib/libcoolstream2'
 if test -e ${srcdir}/lib/libcoolstream2/cs_ir_generic.h; then
 	AC_DEFINE(HAVE_COOLSTREAM_CS_IR_GENERIC_H,1,[Define to 1 if you have the <cs_ir_generic.h> header file.])
 fi

lib/libcoolstream2/cs_frontpanel.h

@@ -120,7 +120,11 @@ typedef struct {
 	unsigned short		xres, yres;
 	unsigned int		segment_count;
 	fp_display_text_type_t	text_support;
+#ifdef __cplusplus
 	bool			number_support;
+#else
+	int			number_support;
+#endif
 } fp_display_caps_t;
 
 #define IOC_FP_SET_BRIGHT	_IOW(0xDE,  1, unsigned char)	/* set the display brighness in 16 steps between 0 to 15 */

lib/libdvbsub/dvbsubtitle.cpp

@@ -11,6 +11,10 @@
  * dvbsubtitle for HD1 ported by Coolstream LTD
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "dvbsubtitle.h"
 
 extern "C" {

src/driver/Makefile.am

@@ -17,10 +17,6 @@ AM_CPPFLAGS = \
 	@AVFORMAT_CFLAGS@ \
 	@HWLIB_CFLAGS@
 
-AM_CPPFLAGS += \
-	@AVFORMAT_CFLAGS@ \
-	@HWLIB_CFLAGS@
-
 noinst_LIBRARIES = libneutrino_driver.a libneutrino_driver_netfile.a
 
 libneutrino_driver_a_SOURCES = \
@@ -31,10 +27,8 @@ libneutrino_driver_a_SOURCES = \
 	colorgradient.cpp \
 	fade.cpp \
 	fb_window.cpp \
-	fbaccel.cpp \
 	file.cpp \
 	fontrenderer.cpp \
-	framebuffer_ng.cpp \
 	genpsi.cpp \
 	moviecut.cpp \
 	neutrinofonts.cpp \
@@ -51,7 +45,12 @@ libneutrino_driver_a_SOURCES = \
 
 if BOXTYPE_COOL
 libneutrino_driver_a_SOURCES += \
+	framebuffer.cpp \
 	vfd.cpp
+else
+libneutrino_driver_a_SOURCES += \
+	fbaccel.cpp \
+	framebuffer_ng.cpp
 endif
 
 if BOXTYPE_TRIPLE

src/driver/framebuffer.h

@@ -21,8 +21,9 @@
 	Boston, MA  02110-1301, USA.
 */
 
+#if !HAVE_COOL_HARDWARE
 #include "framebuffer_ng.h"
-#if 0
+#else
 
 #ifndef __framebuffer__
 #define __framebuffer__
@@ -325,6 +326,7 @@ class CFrameBuffer : public sigc::trackable
 		void fbNoCheck(bool noCheck) { fb_no_check = noCheck; }
 		void doPaintMuteIcon(bool mode) { do_paint_mute_icon = mode; }
 		void blit(void) {}
+		void mark(int, int, int, int) {}
 		sigc::signal<void> OnAfterSetPallette;
 };
 

src/driver/pictureviewer/pv_config.h

@@ -1,3 +1,8 @@
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #define FBV_SUPPORT_PNG
 #define FBV_SUPPORT_BMP
 #define FBV_SUPPORT_JPEG

src/driver/stacktrace.h

@@ -4,6 +4,8 @@
 #ifndef _STACKTRACE_H_
 #define _STACKTRACE_H_
 
+#ifdef HAVE_BACKTRACE
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <execinfo.h>
@@ -89,5 +91,11 @@ static inline void print_stacktrace(FILE *out = stderr, unsigned int max_frames
     free(funcname);
     free(symbollist);
 }
+#else
+
+static inline void print_stacktrace(FILE*, unsigned int) {};
+static inline void print_stacktrace() {};
+
+#endif
 
 #endif // _STACKTRACE_H_

src/gui/movieplayer.cpp

@@ -2227,8 +2227,11 @@ bool CMoviePlayerGui::mountIso(CFile *file)
 	}
 	return false;
 }
-
-void CMoviePlayerGui::makeScreenShot(bool autoshot, bool /*forcover*/)
+void CMoviePlayerGui::makeScreenShot(bool autoshot, bool
+#ifdef SCREENSHOT
+	forcover
+#endif
+	)
 {
 	if (autoshot && (autoshot_done || !g_settings.auto_cover))
 		return;

src/neutrino.cpp

@@ -3590,6 +3590,10 @@ void CNeutrinoApp::ExitRun(const bool /*write_si*/, int retcode)
 
 			printf("[neutrino] This is the end. exiting with code %d\n", retcode);
 			Cleanup();
+#if HAVE_COOL_HARDWARE
+			FILE *f = fopen("/tmp/.shutdown", "w");
+			fclose(f);
+#endif
 #ifdef __sh__
 			/* the sh4 gcc seems to dislike someting about openthreads... */
 			_exit(retcode);

src/system/httptool.cpp

@@ -18,6 +18,10 @@
 	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
 */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <cstring>
 #include <system/httptool.h>
 

src/system/mtdutils/mkfs.jffs2.cpp

@@ -68,6 +68,10 @@
 
 #include <string>
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "rbtree.h"
 #include <system/helpers.h>
 #include <system/localize.h>

src/system/setting_helpers.cpp

@@ -29,6 +29,10 @@
 	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <system/setting_helpers.h>
 #include "configure_network.h"
 #include <stdio.h>