update version to 3.6.0

Prepared for multiplatform builds

.gitignore

@@ -3,6 +3,7 @@ Makefile
 autom4te.cache
 *.in
 aclocal.m4
+compile
 config.*
 configure
 depcomp
@@ -20,6 +21,7 @@ INSTALL
 .libs
 .deps
 *.o
+*.so
 *.lo
 *.a
 *.la
@@ -43,3 +45,10 @@ src/rcsim
 src/gui/version.h
 src/nhttpd/nhttpd.conf
 src/mdev_helper
+local_build_config.h
+
+### system generated stuff
+# dolphin
+.directory
+# kate
+*-swp

.svnignore

@@ -1,12 +0,0 @@
-autom4te.cache
-*.in
-aclocal.m4
-config.*
-configure
-depcomp
-install-sh
-*.pc
-libtool
-ltmain.sh
-missing
-stamp.h1

Makefile.am

@@ -1,3 +1,6 @@
 AUTOMAKE_OPTIONS = gnu
 
 SUBDIRS = lib src data
+
+locale-update:
+	make -C $(top_builddir)/data/locale install-locals

README.md

@@ -0,0 +1 @@
+Neutrino-HD ツ

acinclude.m4

@@ -3,7 +3,6 @@ AM_CONFIG_HEADER(config.h)
 AM_MAINTAINER_MODE
 
 AC_GNU_SOURCE
-AC_SYS_LARGEFILE
 
 AC_ARG_WITH(target,
 	[  --with-target=TARGET    target for compilation [[native,cdk]]],
@@ -11,7 +10,7 @@ AC_ARG_WITH(target,
 
 AC_ARG_WITH(targetprefix,
 	[  --with-targetprefix=PATH  prefix relative to target root (only applicable in cdk mode)],
-	[TARGET_PREFIX="$withval"],[TARGET_PREFIX="NONE"])
+	[TARGET_PREFIX="$withval"],[TARGET_PREFIX=""])
 
 AC_ARG_WITH(debug,
 	[  --without-debug         disable debugging code],
@@ -22,10 +21,13 @@ if test "$DEBUG" = "yes"; then
 	AC_DEFINE(DEBUG,1,[Enable debug messages])
 fi
 
-AC_ARG_ENABLE(tmsdk,
-        AS_HELP_STRING(--enable-tmsdk,         compile inside sdk),
-        ,[enable_tmsdk=no])
-AM_CONDITIONAL(ENABLE_TMSDK,test "$enable_tmsdk" = "yes")
+AC_ARG_ENABLE(reschange,
+       AS_HELP_STRING(--enable-reschange,enable change the osd resolution (default for hd2)))
+
+AM_CONDITIONAL(ENABLE_RESCHANGE,test "$enable_reschange" = "yes")
+if test "$enable_reschange" = "yes"; then
+	AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION,1,[enable change the osd resolution])
+fi
 
 AC_MSG_CHECKING(target)
 
@@ -48,11 +50,10 @@ elif test "$TARGET" = "cdk"; then
 	AC_MSG_RESULT(cdk)
 
 	if test "$CC" = "" -a "$CXX" = ""; then
-		CC=powerpc-tuxbox-linux-gnu-gcc CXX=powerpc-tuxbox-linux-gnu-g++
+		AC_MSG_ERROR([you need to specify variables CC or CXX in cdk])
 	fi
-	if test "$CFLAGS" = "" -a "$CXXFLAGS" = ""; then
-		CFLAGS="-Wall -Os -mcpu=823 -pipe $DEBUG_CFLAGS"
-		CXXFLAGS="-Wall -Os -mcpu=823 -pipe $DEBUG_CFLAGS"
+	if test "$CFLAGS" = "" -o "$CXXFLAGS" = ""; then
+		AC_MSG_ERROR([you need to specify variables CFLAGS and CXXFLAGS in cdk])
 	fi
 	if test "$prefix" = "NONE"; then
 		AC_MSG_ERROR([invalid prefix, you need to specify one in cdk mode])
@@ -64,10 +65,6 @@ elif test "$TARGET" = "cdk"; then
 		AC_MSG_ERROR([invalid targetprefix, you need to specify one in cdk mode])
 		TARGET_PREFIX=""
 	fi
-	if test "$host_alias" = ""; then
-		cross_compiling=yes
-		host_alias=powerpc-tuxbox-linux-gnu
-	fi
 else
 	AC_MSG_RESULT(none)
 	AC_MSG_ERROR([invalid target $TARGET, choose on from native,cdk]);
@@ -75,6 +72,7 @@ fi
 
 AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
+AC_SYS_LARGEFILE
 
 check_path () {
 	return $(perl -e "if(\"$1\"=~m#^/usr/(local/)?bin#){print \"0\"}else{print \"1\";}")
@@ -82,21 +80,33 @@ check_path () {
 
 ])
 
+dnl expand nested ${foo}/bar
+AC_DEFUN([TUXBOX_EXPAND_VARIABLE],[__$1="$2"
+	for __CNT in false false false false true; do dnl max 5 levels of indirection
+
+		$1=`eval echo "$__$1"`
+		echo ${$1} | grep -q '\$' || break # 'grep -q' is POSIX, exit if no $ in variable
+		__$1="${$1}"
+	done
+	$__CNT && AC_MSG_ERROR([can't expand variable $1=$2]) dnl bail out if we did not expand
+])
+
 AC_DEFUN([TUXBOX_APPS_DIRECTORY_ONE],[
 AC_ARG_WITH($1,[  $6$7 [[PREFIX$4$5]]],[
 	_$2=$withval
 	if test "$TARGET" = "cdk"; then
-		$2=`eval echo "$TARGET_PREFIX$withval"`
+		$2=`eval echo "$TARGET_PREFIX$withval"` # no indirection possible IMNSHO
 	else
 		$2=$withval
 	fi
 	TARGET_$2=${$2}
 ],[
-	$2="\${$3}$5"
+	# RFC 1925: "you can always add another level of indirection..."
+	TUXBOX_EXPAND_VARIABLE($2,"${$3}$5")
 	if test "$TARGET" = "cdk"; then
-		_$2=`eval echo "${target$3}$5"`
+		TUXBOX_EXPAND_VARIABLE(_$2,"${target$3}$5")
 	else
-		_$2=`eval echo "${$3}$5"`
+		_$2=${$2}
 	fi
 	TARGET_$2=$_$2
 ])
@@ -120,145 +130,93 @@ if test "$TARGET" = "cdk"; then
 	targetlocalstatedir="\${TARGET_PREFIX}/var"
 	targetlibdir="\${TARGET_PREFIX}/lib"
 	targetmntdir="\${TARGET_PREFIX}/mnt"
+else
+	mntdir="/mnt" # hack
 fi
 
 TUXBOX_APPS_DIRECTORY_ONE(configdir,CONFIGDIR,localstatedir,/var,/tuxbox/config,
-	[--with-configdir=PATH   ],[where to find the config files])
+	[--with-configdir=PATH         ],[where to find the config files])
 
 TUXBOX_APPS_DIRECTORY_ONE(datadir,DATADIR,datadir,/share,/tuxbox,
-	[--with-datadir=PATH     ],[where to find data])
+	[--with-datadir=PATH           ],[where to find data])
 
 TUXBOX_APPS_DIRECTORY_ONE(fontdir,FONTDIR,datadir,/share,/fonts,
-	[--with-fontdir=PATH     ],[where to find the fonts])
+	[--with-fontdir=PATH           ],[where to find the fonts])
 
 TUXBOX_APPS_DIRECTORY_ONE(gamesdir,GAMESDIR,localstatedir,/var,/tuxbox/games,
-	[--with-gamesdir=PATH    ],[where games data is stored])
+	[--with-gamesdir=PATH          ],[where games data is stored])
 
 TUXBOX_APPS_DIRECTORY_ONE(libdir,LIBDIR,libdir,/lib,/tuxbox,
-	[--with-libdir=PATH      ],[where to find the internal libs])
+	[--with-libdir=PATH            ],[where to find the internal libs])
 
 TUXBOX_APPS_DIRECTORY_ONE(plugindir,PLUGINDIR,libdir,/lib,/tuxbox/plugins,
-	[--with-plugindir=PATH   ],[where to find the plugins])
+	[--with-plugindir=PATH         ],[where to find the plugins])
+
+TUXBOX_APPS_DIRECTORY_ONE(plugindir_var,PLUGINDIR_VAR,localstatedir,/var,/tuxbox/plugins,
+	[--with-plugindir_var=PATH     ],[where to find the plugins in /var])
+
+TUXBOX_APPS_DIRECTORY_ONE(webtvdir_var,WEBTVDIR_VAR,localstatedir,/var,/tuxbox/plugins/webtv,
+	[--with-webtvdir_var=PATH      ],[where to find the livestreamScriptPath in /var])
+
+TUXBOX_APPS_DIRECTORY_ONE(plugindir_mnt,PLUGINDIR_MNT,mntdir,/mnt,/plugins,
+	[--with-plugindir_mnt=PATH     ],[where to find the the extern plugins])
 
 TUXBOX_APPS_DIRECTORY_ONE(luaplugindir,LUAPLUGINDIR,libdir,/lib,/tuxbox/luaplugins,
-	[--with-luaplugindir=PATH   ],[where to find Lua plugins])
+	[--with-luaplugindir=PATH      ],[where to find Lua plugins])
 
-TUXBOX_APPS_DIRECTORY_ONE(ucodedir,UCODEDIR,localstatedir,/var,/tuxbox/ucodes,
-	[--with-ucodedir=PATH    ],[where to find the ucodes])
+TUXBOX_APPS_DIRECTORY_ONE(localedir,LOCALEDIR,datadir,/share, /tuxbox/neutrino/locale,
+	[--with-localedir=PATH         ],[where to find the locale])
 
-TUXBOX_APPS_DIRECTORY_ONE(themesdir,THEMESDIR,datadir,/share/tuxbox, /neutrino/themes,
-	[--with-themesdir=PATH     ],[where to find the themes (don't change)])
+TUXBOX_APPS_DIRECTORY_ONE(localedir_var,LOCALEDIR_VAR,localstatedir,/var,/tuxbox/locale,
+	[--with-localedir_var=PATH     ],[where to find the locale in /var])
 
-TUXBOX_APPS_DIRECTORY_ONE(iconsdir,ICONSDIR,datadir,/share/tuxbox, /neutrino/icons,
-	[--with-iconsdir=PATH     ],[where to find the icons (don't change)])
+TUXBOX_APPS_DIRECTORY_ONE(themesdir,THEMESDIR,datadir,/share, /tuxbox/neutrino/themes,
+	[--with-themesdir=PATH         ],[where to find the themes])
+
+TUXBOX_APPS_DIRECTORY_ONE(themesdir_var,THEMESDIR_VAR,localstatedir,/var,/tuxbox/themes,
+	[--with-themesdir_var=PATH     ],[where to find the themes in /var])
+
+TUXBOX_APPS_DIRECTORY_ONE(iconsdir,ICONSDIR,datadir,/share, /tuxbox/neutrino/icons,
+	[--with-iconsdir=PATH          ],[where to find the icons])
+
+TUXBOX_APPS_DIRECTORY_ONE(iconsdir_var,ICONSDIR_VAR,localstatedir,/var,/tuxbox/icons,
+	[--with-iconsdir_var=PATH      ],[where to find the icons in /var])
 
 TUXBOX_APPS_DIRECTORY_ONE(private_httpddir,PRIVATE_HTTPDDIR,datadir,/share,/tuxbox/neutrino/httpd,
-	[--with-private_httpddir=PATH     ],[where to find the the private httpd files])
+	[--with-private_httpddir=PATH  ],[where to find the the private httpd files])
 
 TUXBOX_APPS_DIRECTORY_ONE(public_httpddir,PUBLIC_HTTPDDIR,localstatedir,/var,/httpd,
-	[--with-public_httpddir=PATH     ],[where to find the the public httpd files])
+	[--with-public_httpddir=PATH   ],[where to find the the public httpd files])
 
 TUXBOX_APPS_DIRECTORY_ONE(hosted_httpddir,HOSTED_HTTPDDIR,mntdir,/mnt,/hosted,
-	[--with-hosted_httpddir=PATH     ],[where to find the the hosted files])
+	[--with-hosted_httpddir=PATH   ],[where to find the the hosted files])
 ])
 
 dnl automake <= 1.6 needs this specifications
 AC_SUBST(CONFIGDIR)
 AC_SUBST(DATADIR)
 AC_SUBST(FONTDIR)
+AC_SUBST(FONTDIR_VAR)
 AC_SUBST(GAMESDIR)
 AC_SUBST(LIBDIR)
 AC_SUBST(MNTDIR)
 AC_SUBST(PLUGINDIR)
+AC_SUBST(PLUGINDIR_VAR)
+AC_SUBST(WEBTVDIR)
+AC_SUBST(WEBTVDIR_VAR)
+AC_SUBST(PLUGINDIR_MNT)
 AC_SUBST(LUAPLUGINDIR)
-AC_SUBST(UCODEDIR)
+AC_SUBST(LOCALEDIR)
+AC_SUBST(LOCALEDIR_VAR)
 AC_SUBST(THEMESDIR)
+AC_SUBST(THEMESDIR_VAR)
 AC_SUBST(ICONSDIR)
+AC_SUBST(ICONSDIR_VAR)
 AC_SUBST(PRIVATE_HTTPDDIR)
 AC_SUBST(PUBLIC_HTTPDDIR)
 AC_SUBST(HOSTED_HTTPDDIR)
 dnl end workaround
 
-AC_DEFUN([TUXBOX_APPS_ENDIAN],[
-AC_CHECK_HEADERS(endian.h)
-AC_C_BIGENDIAN
-])
-
-AC_DEFUN([TUXBOX_APPS_DRIVER],[
-AC_ARG_WITH(driver,
-	[  --with-driver=PATH      path for driver sources [[NONE]]],
-	[DRIVER="$withval"],[DRIVER=""])
-
-if test -d "$DRIVER/include"; then
-	AC_DEFINE(HAVE_DBOX2_DRIVER,1,[Define to 1 if you have the dbox2 driver sources])
-else
-	AC_MSG_ERROR([can't find driver sources])
-fi
-
-AC_SUBST(DRIVER)
-
-CPPFLAGS="$CPPFLAGS -I$DRIVER/include"
-])
-
-AC_DEFUN([TUXBOX_APPS_DVB],[
-AC_ARG_WITH(dvbincludes,
-	[  --with-dvbincludes=PATH  path for dvb includes [[NONE]]],
-	[DVBINCLUDES="$withval"],[DVBINCLUDES=""])
-
-if test "$DVBINCLUDES"; then
-	CPPFLAGS="-I$DVBINCLUDES $CPPFLAGS"
-	CFLAGS="-I$DVBINCLUDES $CFLAGS"
-	CXXFLAGS="-I$DVBINCLUDES $CXXFLAGS"
-fi
-
-AC_CHECK_HEADERS(ost/dmx.h,[
-	DVB_API_VERSION=1
-	AC_MSG_NOTICE([found dvb version 1])
-])
-
-if test -z "$DVB_API_VERSION"; then
-AC_CHECK_HEADERS(linux/dvb/version.h,[
-	AC_LANG_PREPROC_REQUIRE()
-	AC_REQUIRE([AC_PROG_EGREP])
-	AC_LANG_CONFTEST([AC_LANG_SOURCE([[
-#include <linux/dvb/version.h>
-version DVB_API_VERSION
-	]])])
-	DVB_API_VERSION=`(eval "$ac_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD | $EGREP "^version" | sed "s,version\ ,,"`
-
-	AC_LANG_CONFTEST([AC_LANG_SOURCE([[
-#include <linux/dvb/version.h>
-version DVB_API_VERSION_MINOR
-	]])])
-	DVB_API_VERSION_MINOR=`(eval "$ac_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD | $EGREP "^version" | sed "s,version\ ,,"`
-	rm -f conftest*
-
-	AC_MSG_NOTICE([found dvb version $DVB_API_VERSION.$DVB_API_VERSION_MINOR])
-])
-fi
-
-if test "$DVB_API_VERSION"; then
-	AC_DEFINE(HAVE_DVB,1,[Define to 1 if you have the dvb includes])
-	AC_DEFINE_UNQUOTED(HAVE_DVB_API_VERSION,$DVB_API_VERSION,[Define to the version of the dvb api])
-else
-	AC_MSG_ERROR([can't find dvb headers])
-fi
-
-if test "$DVB_API_VERSION_MINOR"; then
-	AC_DEFINE_UNQUOTED(HAVE_DVB_API_VERSION_MINOR,$DVB_API_VERSION_MINOR,[Define to the minor version of the dvb api])
-else
-	AC_DEFINE_UNQUOTED(HAVE_DVB_API_VERSION_MINOR,0,[Define to the minor version of the dvb api])
-fi
-])
-
-AC_DEFUN([TUXBOX_APPS_CAPTURE],[
-AC_CHECK_HEADER(linux/dvb/avia/avia_gt_capture.h,[
-	AC_DEFINE(HAVE_OLD_CAPTURE_API,1,[Define this if you want to use the old dbox2 capture API])
-	AC_MSG_NOTICE([using old demux capture API])],[
-	AC_MSG_NOTICE([using v4l2 capture API])
-	])
-])	
-
 AC_DEFUN([_TUXBOX_APPS_LIB_CONFIG],[
 AC_PATH_PROG($1_CONFIG,$2,no)
 if test "$$1_CONFIG" != "no"; then
@@ -296,8 +254,13 @@ _TUXBOX_APPS_LIB_CONFIG($1,$2,WARN)
 ])
 
 AC_DEFUN([TUXBOX_APPS_PKGCONFIG],[
-AC_PATH_PROG(PKG_CONFIG, pkg-config,no)
-if test "$PKG_CONFIG" = "no" ; then
+m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+fi
+if test x"$PKG_CONFIG" = x"" ; then
 	AC_MSG_ERROR([could not find pkg-config]);
 fi
 ])
@@ -309,6 +272,7 @@ if $PKG_CONFIG --exists "$2" ; then
 	AC_MSG_RESULT(yes)
 	$1_CFLAGS=$($PKG_CONFIG --cflags "$2")
 	$1_LIBS=$($PKG_CONFIG --libs "$2")
+	$1_EXISTS=yes
 else
 	AC_MSG_RESULT(no)
 fi
@@ -319,7 +283,7 @@ AC_SUBST($1_LIBS)
 
 AC_DEFUN([TUXBOX_APPS_LIB_PKGCONFIG],[
 _TUXBOX_APPS_LIB_PKGCONFIG($1,$2)
-if test -z "$$1_CFLAGS" ; then
+if test x"$$1_EXISTS" != xyes; then
 	AC_MSG_ERROR([could not find package $2]);
 fi
 ])
@@ -328,145 +292,42 @@ AC_DEFUN([TUXBOX_APPS_LIB_PKGCONFIG_CHECK],[
 _TUXBOX_APPS_LIB_PKGCONFIG($1,$2)
 ])
 
-AC_DEFUN([_TUXBOX_APPS_LIB_SYMBOL],[
-AC_CHECK_LIB($2,$3,HAVE_$1="yes",HAVE_$1="no")
-if test "$HAVE_$1" = "yes"; then
-	$1_LIBS=-l$2
-fi
-
-AC_SUBST($1_LIBS)
-])
-
-AC_DEFUN([TUXBOX_APPS_LIB_SYMBOL],[
-_TUXBOX_APPS_LIB_SYMBOL($1,$2,$3,ERROR)
-if test "$HAVE_$1" = "no"; then
-	AC_MSG_ERROR([could not find $2]);
-fi
-])
-
-AC_DEFUN([TUXBOX_APPS_LIB_CONFIG_SYMBOL],[
-_TUXBOX_APPS_LIB_SYMBOL($1,$2,$3,WARN)
-])
-
-AC_DEFUN([TUXBOX_APPS_GETTEXT],[
-AC_PATH_PROG(MSGFMT, msgfmt, no)
-AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-AC_PATH_PROG(XGETTEXT, xgettext, no)
-AC_PATH_PROG(MSGMERGE, msgmerge, no)
-
-AC_MSG_CHECKING([whether NLS is requested])
-AC_ARG_ENABLE(nls,
-	[  --disable-nls           do not use Native Language Support],
-	USE_NLS=$enableval, USE_NLS=yes)
-AC_MSG_RESULT($USE_NLS)
-AC_SUBST(USE_NLS)
-
-if test "$USE_NLS" = "yes"; then
-	AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc,[
-		AC_TRY_LINK([
-			#include <libintl.h>
-			#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-			#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
-			#endif
-			extern int _nl_msg_cat_cntr;
-			extern int *_nl_domain_bindings;
-			],[
-			bindtextdomain ("", "");
-			return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings;
-			], gt_cv_func_gnugettext_libc=yes, gt_cv_func_gnugettext_libc=no
-		)]
-	)
-
-	if test "$gt_cv_func_gnugettext_libc" = "yes"; then
-		AC_DEFINE(ENABLE_NLS, 1, [Define to 1 if translation of program messages to the user's native language is requested.])
-		gt_use_preinstalled_gnugettext=yes
-	else
-		USE_NLS=no
-	fi
-fi
-
-if test -f "$srcdir/po/LINGUAS"; then
-	ALL_LINGUAS=$(sed -e "/^#/d" "$srcdir/po/LINGUAS")
-fi
-
-POFILES=
-GMOFILES=
-UPDATEPOFILES=
-DUMMYPOFILES=
-for lang in $ALL_LINGUAS; do
-	POFILES="$POFILES $srcdirpre$lang.po"
-	GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
-	UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
-	DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
-done
-INST_LINGUAS=
-if test -n "$ALL_LINGUAS"; then
-	for presentlang in $ALL_LINGUAS; do
-		useit=no
-		if test -n "$LINGUAS"; then
-			desiredlanguages="$LINGUAS"
-		else
-			desiredlanguages="$ALL_LINGUAS"
-		fi
-		for desiredlang in $desiredlanguages; do
-			case "$desiredlang" in
-				"$presentlang"*) useit=yes;;
-			esac
-		done
-		if test $useit = yes; then
-			INST_LINGUAS="$INST_LINGUAS $presentlang"
-		fi
-	done
-fi
-CATALOGS=
-if test -n "$INST_LINGUAS"; then
-	for lang in $INST_LINGUAS; do
-		CATALOGS="$CATALOGS $lang.gmo"
-	done
-fi
-AC_SUBST(POFILES)
-AC_SUBST(GMOFILES)
-AC_SUBST(UPDATEPOFILES)
-AC_SUBST(DUMMYPOFILES)
-AC_SUBST(CATALOGS)
-])
-
 AC_DEFUN([TUXBOX_BOXTYPE],[
 AC_ARG_WITH(boxtype,
-	[  --with-boxtype          valid values: dbox2,tripledragon,dreambox,ipbox,coolstream,generic],
+	[  --with-boxtype          valid values: tripledragon,coolstream,spark,azbox,generic],
 	[case "${withval}" in
-		dbox2|dreambox|ipbox|tripledragon|coolstream|generic)
+		tripledragon|coolstream|spark|azbox|generic)
 			BOXTYPE="$withval"
 			;;
-		dm*)
-			BOXTYPE="dreambox"
-			BOXMODEL="$withval"
-			;;
 		*)
 			AC_MSG_ERROR([bad value $withval for --with-boxtype]) ;;
 	esac], [BOXTYPE="coolstream"])
 
 AC_ARG_WITH(boxmodel,
-	[  --with-boxmodel         valid for coolstream: nevis, apollo
-                          valid for dreambox: dm500, dm500plus, dm600pvr, dm56x0, dm7000, dm7020, dm7025
-                          valid for ipbox: ip200, ip250, ip350, ip400],
+	[  --with-boxmodel         valid for coolstream: hd1, hd2
+                          valid for generic: raspi],
 	[case "${withval}" in
-		nevis|apollo)
+		hd1|hd2)
 			if test "$BOXTYPE" = "coolstream"; then
 				BOXMODEL="$withval"
 			else
 				AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE])
 			fi
 			;;
-		dm500|dm500plus|dm600pvr|dm56x0|dm7000|dm7020|dm7025)
-			if test "$BOXTYPE" = "dreambox"; then
-				BOXMODEL="$withval"
+		nevis|apollo)
+			if test "$BOXTYPE" = "coolstream"; then
+				if test "$withval" = "nevis"; then
+					BOXMODEL="hd1"
+				fi
+				if test "$withval" = "apollo"; then
+					BOXMODEL="hd2"
+				fi
 			else
 				AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE])
 			fi
 			;;
-		ip200|ip250|ip350|ip400)
-			if test "$BOXTYPE" = "ipbox"; then
+		raspi)
+			if test "$BOXTYPE" = "generic"; then
 				BOXMODEL="$withval"
 			else
 				AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE])
@@ -475,64 +336,43 @@ AC_ARG_WITH(boxmodel,
 		*)
 			AC_MSG_ERROR([unsupported value $withval for --with-boxmodel])
 			;;
-	esac], [BOXMODEL="nevis"]
-	[if test "$BOXTYPE" = "dreambox" -o "$BOXTYPE" = "ipbox" && test -z "$BOXMODEL"; then
-		AC_MSG_ERROR([Dreambox/IPBox needs --with-boxmodel])
-	fi])
+	esac], [test "$BOXTYPE" = "coolstream" && BOXMODEL="hd1" || true]
+	)
 
 AC_SUBST(BOXTYPE)
 AC_SUBST(BOXMODEL)
 
-AM_CONDITIONAL(BOXTYPE_DBOX2, test "$BOXTYPE" = "dbox2")
+AM_CONDITIONAL(BOXTYPE_AZBOX, test "$BOXTYPE" = "azbox")
 AM_CONDITIONAL(BOXTYPE_TRIPLE, test "$BOXTYPE" = "tripledragon")
-AM_CONDITIONAL(BOXTYPE_DREAMBOX, test "$BOXTYPE" = "dreambox")
-AM_CONDITIONAL(BOXTYPE_IPBOX, test "$BOXTYPE" = "ipbox")
 AM_CONDITIONAL(BOXTYPE_COOL, test "$BOXTYPE" = "coolstream")
+AM_CONDITIONAL(BOXTYPE_SPARK, test "$BOXTYPE" = "spark")
 AM_CONDITIONAL(BOXTYPE_GENERIC, test "$BOXTYPE" = "generic")
 
-AM_CONDITIONAL(BOXMODEL_NEVIS,test "$BOXMODEL" = "nevis")
-AM_CONDITIONAL(BOXMODEL_APOLLO,test "$BOXMODEL" = "apollo")
+AM_CONDITIONAL(BOXMODEL_CS_HD1,test "$BOXMODEL" = "hd1")
+AM_CONDITIONAL(BOXMODEL_CS_HD2,test "$BOXMODEL" = "hd2")
 
-AM_CONDITIONAL(BOXMODEL_DM500,test "$BOXMODEL" = "dm500")
-AM_CONDITIONAL(BOXMODEL_DM500PLUS,test "$BOXMODEL" = "dm500plus")
-AM_CONDITIONAL(BOXMODEL_DM600PVR,test "$BOXMODEL" = "dm600pvr")
-AM_CONDITIONAL(BOXMODEL_DM56x0,test "$BOXMODEL" = "dm56x0")
-AM_CONDITIONAL(BOXMODEL_DM7000,test "$BOXMODEL" = "dm7000" -o "$BOXMODEL" = "dm7020" -o "$BOXMODEL" = "dm7025")
+AM_CONDITIONAL(BOXMODEL_RASPI,test "$BOXMODEL" = "raspi")
 
-AM_CONDITIONAL(BOXMODEL_IP200,test "$BOXMODEL" = "ip200")
-AM_CONDITIONAL(BOXMODEL_IP250,test "$BOXMODEL" = "ip250")
-AM_CONDITIONAL(BOXMODEL_IP350,test "$BOXMODEL" = "ip350")
-AM_CONDITIONAL(BOXMODEL_IP400,test "$BOXMODEL" = "ip400")
-
-if test "$BOXTYPE" = "dbox2"; then
-	AC_DEFINE(HAVE_DBOX_HARDWARE, 1, [building for a dbox2])
+if test "$BOXTYPE" = "azbox"; then
+	AC_DEFINE(HAVE_AZBOX_HARDWARE, 1, [building for an azbox])
 elif test "$BOXTYPE" = "tripledragon"; then
 	AC_DEFINE(HAVE_TRIPLEDRAGON, 1, [building for a tripledragon])
-elif test "$BOXTYPE" = "dreambox"; then
-	AC_DEFINE(HAVE_DREAMBOX_HARDWARE, 1, [building for a dreambox])
-elif test "$BOXTYPE" = "ipbox"; then
-	AC_DEFINE(HAVE_IPBOX_HARDWARE, 1, [building for an ipbox])
 elif test "$BOXTYPE" = "coolstream"; then
 	AC_DEFINE(HAVE_COOL_HARDWARE, 1, [building for a coolstream])
+elif test "$BOXTYPE" = "spark"; then
+	AC_DEFINE(HAVE_SPARK_HARDWARE, 1, [building for a goldenmedia 990 or edision pingulux])
 elif test "$BOXTYPE" = "generic"; then
 	AC_DEFINE(HAVE_GENERIC_HARDWARE, 1, [building for a generic device like a standard PC])
 fi
 
 # TODO: do we need more defines?
-if test "$BOXMODEL" = "nevis"; then
-	AC_DEFINE(BOXMODEL_NEVIS, 1, [coolstream hd1/neo/neo2/zee])
-elif test "$BOXMODEL" = "apollo"; then
-	AC_DEFINE(BOXMODEL_APOLLO, 1, [coolstream tank])
-elif test "$BOXMODEL" = "dm500"; then
-	AC_DEFINE(BOXMODEL_DM500, 1, [dreambox 500])
-elif test "$BOXMODEL" = "ip200"; then
-	AC_DEFINE(BOXMODEL_IP200, 1, [ipbox 200])
-elif test "$BOXMODEL" = "ip250"; then
-	AC_DEFINE(BOXMODEL_IP250, 1, [ipbox 250])
-elif test "$BOXMODEL" = "ip350"; then
-	AC_DEFINE(BOXMODEL_IP350, 1, [ipbox 350])
-elif test "$BOXMODEL" = "ip400"; then
-	AC_DEFINE(BOXMODEL_IP400, 1, [ipbox 400])
+if test "$BOXMODEL" = "hd1"; then
+	AC_DEFINE(BOXMODEL_CS_HD1, 1, [coolstream hd1/neo/neo2/zee])
+elif test "$BOXMODEL" = "hd2"; then
+	AC_DEFINE(BOXMODEL_CS_HD2, 1, [coolstream tank/trinity/trinity v2/trinity duo/zee2/link])
+	AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION,1,[enable change the osd resolution])
+elif test "$BOXMODEL" = "raspi"; then
+	AC_DEFINE(BOXMODEL_RASPI, 1, [Raspberry pi])
 fi
 ])
 
@@ -557,4 +397,3 @@ AC_DEFUN([AC_PROG_EGREP],
  EGREP=$ac_cv_prog_egrep
  AC_SUBST([EGREP])
 ])
-

autogen.sh

@@ -6,67 +6,10 @@ srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
 cd "$srcdir"
-DIE=0
-
-(autoconf --version) < /dev/null > /dev/null 2>&1 || {
-	echo
-	echo "You must have autoconf installed to compile $package."
-	echo "Download the appropriate package for your system,"
-	echo "or get the source from one of the GNU ftp sites"
-	echo "listed in http://www.gnu.org/order/ftp.html"
-	DIE=1
-}
-
-(automake --version) < /dev/null > /dev/null 2>&1 || {
-	echo
-	echo "You must have automake installed to compile $package."
-	echo "Download the appropriate package for your system,"
-	echo "or get the source from one of the GNU ftp sites"
-	echo "listed in http://www.gnu.org/order/ftp.html"
-	DIE=1
-}
-
-(libtool --version) < /dev/null > /dev/null 2>&1 || {
-	echo
-	echo "You must have libtool installed to compile $package."
-	echo "Download the appropriate package for your system,"
-	echo "or get the source from one of the GNU ftp sites"
-	echo "listed in http://www.gnu.org/order/ftp.html"
-	DIE=1
-}
-
-#(gettext --version) < /dev/null > /dev/null 2>&1 || {
-#	echo
-#	echo "You must have gettext installed to compile $package."
-#	echo "Download the appropriate package for your system,"
-#	echo "or get the source from one of the GNU ftp sites"
-#	echo "listed in http://www.gnu.org/order/ftp.html"
-#	DIE=1
-#}
-
-if test "$DIE" -eq 1; then
-	exit 1
-fi
-
-if [ ! -e acinclude.m4 ]; then
-	for i in .. ../.. ../../..; do
-		if [ -e `pwd`/$i/acinclude.m4 ]; then
-			ln -s `pwd`/$i/acinclude.m4 .
-		fi
-	done
-fi
-
 echo "Generating configuration files for $package, please wait...."
 
-echo "  aclocal $ACLOCAL_FLAGS"
-aclocal $ACLOCAL_FLAGS
-echo "  libtoolize --automake"
-libtoolize --automake
-#echo "  gettextize"
-#gettextize
-echo "  autoconf"
-autoconf
-echo "  autoheader"
-autoheader
-echo "  automake --add-missing"
-automake --add-missing 
+aclocal --force
+libtoolize --force
+autoconf --force
+autoheader  --force
+automake --add-missing --force-missing --foreign

configure.ac

@@ -1,9 +1,8 @@
-AC_INIT(tuxbox-neutrino,1.0.1)
+AC_INIT(Tuxbox-Neutrino,3.6.0)
 AM_INIT_AUTOMAKE([1.0.1 nostdinc])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
 
 TUXBOX_APPS
-TUXBOX_APPS_DVB
 TUXBOX_APPS_DIRECTORY
 TUXBOX_APPS_PKGCONFIG
 TUXBOX_BOXTYPE
@@ -13,19 +12,27 @@ AC_PROG_CXX
 AC_DISABLE_STATIC
 AM_PROG_LIBTOOL
 
-# Add build information to config.h
-# ---------------------------------
-
-# Add host to config.h
-AC_DEFINE_UNQUOTED(USED_BUILD, ["$build"], [Build system under which the program was compiled on.])
-
-# Add used CXXFLAGS to config.h
-AC_DEFINE_UNQUOTED(USED_CXXFLAGS, ["$CXXFLAGS"], [Define to the used CXXFLAGS to compile this package.])
-
-# Get compiler (version)
-AH_TEMPLATE(USED_COMPILER, [Define to name and version of used compiler])
+# Add build information to local_build_config.h.tmp
+# -------------------------------------------------
+rm -f local_build_config.h.tmp
+cat > local_build_config.h.tmp << EOF
+/* Build system under which the program was compiled on. */
+#define USED_BUILD "$build"
+/* Define to the used CXXFLAGS to compile this package. */
+#define USED_CXXFLAGS "$CXXFLAGS"
+EOF
 if COMPILER=`$CC --version | head -n 1`; then
-    AC_DEFINE_UNQUOTED(USED_COMPILER, ["$COMPILER"])
+	cat >> local_build_config.h.tmp <<-EOF
+	/* Define to name and version of used compiler */
+	#define USED_COMPILER "$COMPILER"
+	EOF
+fi
+# only update header if it differs to avoid unnecessary rebuilds
+if ! diff local_build_config.h.tmp local_build_config.h >/dev/null 2>&1; then
+	rm -f local_build_config.h
+	mv local_build_config.h.tmp local_build_config.h
+else
+	rm -f local_build_config.h.tmp
 fi
 
 AC_ARG_ENABLE(ffmpegdec,
@@ -77,6 +84,7 @@ TUXBOX_APPS_LIB_PKGCONFIG_CHECK(OGG,ogg)
 if test -z "$OGG_CFLAGS" ; then
 	TUXBOX_APPS_LIB_PKGCONFIG(OGG,ogg)
 fi
+TUXBOX_APPS_LIB_PKGCONFIG(SWRESAMPLE,libswresample)
 else
 TUXBOX_APPS_LIB_PKGCONFIG(SWRESAMPLE,libswresample)
 fi
@@ -88,14 +96,55 @@ fi
 AM_CONDITIONAL(USE_TREMOR, test "$TREMOR" = "yes")
 
 # TUXBOX_APPS_LIB_PKGCONFIG(OPENSSL,openssl)
-TUXBOX_APPS_LIB_CONFIG(CURL,curl-config)
-TUXBOX_APPS_LIB_CONFIG(FREETYPE,freetype-config)
+TUXBOX_APPS_LIB_PKGCONFIG(CURL,libcurl)
+
+## For the check you must use the corresponding libtool number as version number,
+## see freetype source code docs/VERSIONS.TXT
+PKG_CHECK_MODULES([FREETYPE], [freetype2 >= 16.2.10],
+	[echo "freetype2 >= 2.5.0 found"], [
+	## If freetype is not found:
+	## Activate this line if you want to search with freetype-config instead
+	[echo "freetype2 >= 2.5.0 not found, use alternative search method with freetype-config"]
+	## Activate this line if you want to abort
+#	AC_MSG_ERROR([freetype2 >= 2.5.0 not found])
+	])
+
+# fallback to curl-config (which is ugly for cross-compilation)
+if test -z "$CURL_LIBS" -a -z "$CURL_CFLAGS"; then
+	TUXBOX_APPS_LIB_CONFIG(CURL,curl-config)
+fi
+# fallback to freetype-config (which is ugly for cross-compilation)
+if test -z "$FREETYPE_LIBS" -a -z "$FREETYPE_CFLAGS"; then
+	TUXBOX_APPS_LIB_CONFIG(FREETYPE,freetype-config)
+	CPPFLAGS+=" $FREETYPE_CFLAGS"
+	AC_MSG_CHECKING([whether FreeType version is 2.5.0 or higher])
+		AC_TRY_CPP([
+			#include <ft2build.h>
+			#include FT_FREETYPE_H
+			#if FREETYPE_MAJOR < 2 || (FREETYPE_MAJOR == 2 && FREETYPE_MINOR < 5)
+			#error Freetype version too low.
+			#endif
+			],
+			[AC_MSG_RESULT(yes)],
+			[AC_MSG_ERROR([Need FreeType library version 2.5.0 or higher])
+		])
+fi
 
 TUXBOX_APPS_LIB_PKGCONFIG(PNG,libpng)
 TUXBOX_APPS_LIB_PKGCONFIG(AVFORMAT,libavformat)
 TUXBOX_APPS_LIB_PKGCONFIG(AVCODEC,libavcodec)
 TUXBOX_APPS_LIB_PKGCONFIG(AVUTIL,libavutil)
-TUXBOX_APPS_LIB_PKGCONFIG(BLURAY,libbluray)
+if test "$BOXTYPE" = "coolstream"; then
+	TUXBOX_APPS_LIB_PKGCONFIG(BLURAY,libbluray)
+fi
+
+if test "$BOXTYPE" = "coolstream" ||
+   test "$BOXTYPE" = "generic" ||
+   test "$BOXTYPE" = "tripledragon" ||
+   test "$BOXTYPE" = "spark"; then
+	AC_DEFINE(SCREENSHOT,1,[Define to 1 if the platform supports screenshots])
+fi
+
 TUXBOX_APPS_LIB_PKGCONFIG(SIGC,sigc++-2.0)
 
 #TUXBOX_APPS_LIB_PKGCONFIG(CONFIGFILE,tuxbox-configfile)
@@ -114,10 +163,6 @@ AC_ARG_ENABLE(keyboard-no-rc,
          [  --enable-keyboard-no-rc             enable keyboard control, disable rc control],
          [AC_DEFINE(KEYBOARD_INSTEAD_OF_REMOTE_CONTROL,1,[enable keyboard control, disable rc control])])
 
-AC_ARG_ENABLE(restore-prev-mode,
-         [  --enable-restore-prev-mode          enable return from graphics mode],
-         [AC_DEFINE(RETURN_FROM_GRAPHICS_MODE,1,[enable return from graphics mode])])
-
 AC_ARG_ENABLE(mdev,
 	[  --enable-mdev disable broken neutrino mount hack, use with mdev],
 	[AC_DEFINE(ASSUME_MDEV,1,[disable broken neutrino mount hack, use with mdev])])
@@ -126,6 +171,16 @@ AC_ARG_ENABLE(freesatepg,
 	[  --enable-freesatepg                  enable Freesat EPG code (experimental)],
 	[AC_DEFINE(ENABLE_FREESATEPG,1,[enable Freesat EPG code])])
 
+AC_ARG_ENABLE(viasatepg,
+	[  --enable-viasatepg                  enable ViaSat EPG code (experimental)],
+	[AC_DEFINE(ENABLE_VIASATEPG,1,[enable ViaSat EPG code])])
+
+AC_ARG_ENABLE(fastscan,
+	[  --enable-fastscan                   enable Fastscan code)],
+	[AC_DEFINE(ENABLE_FASTSCAN,1,[enable fastscan code])])
+
+AM_CONDITIONAL(ENABLE_FASTSCAN, test "$enable_fastscan" = "yes")
+
 AC_ARG_ENABLE(giflib,
 	AS_HELP_STRING(--enable-giflib,use giflib instead of libungif),
 	,[enable_giflib=no])
@@ -135,6 +190,17 @@ if test "$enable_giflib" = "yes"; then
 	AC_DEFINE(ENABLE_GIFLIB,1,[use giflib instead of libungif])
 fi
 
+### USE_PUGIXML
+AC_ARG_ENABLE(pugixml,
+       AS_HELP_STRING(--enable-pugixml,use pugixml instead of xmltree),
+       ,[enable_pugixml=no])
+
+AM_CONDITIONAL(USE_PUGIXML,test "$enable_pugixml" = "yes")
+if test "$enable_pugixml" = "yes"; then
+       AC_DEFINE(USE_PUGIXML,1,[use pugixml instead of xmltree])
+fi
+
+
 # FLAC - Free Lossless Audio Codec
 AC_ARG_ENABLE(flac,
 	AS_HELP_STRING(--enable-flac,include FLAC support),
@@ -155,10 +221,35 @@ if test "$enable_upnp" = "yes"; then
 	AC_DEFINE(ENABLE_UPNP,1,[include UPNP support - currently broken])
 fi
 
+AC_ARG_ENABLE(extupdate,
+	AS_HELP_STRING(--enable-extupdate,include extended update routine),
+	,[enable_extupdate=no])
+
+AM_CONDITIONAL(ENABLE_EXTUPDATE,test "$enable_extupdate" = "yes")
+if test "$enable_extupdate" = "yes"; then
+	AC_DEFINE(ENABLE_EXTUPDATE,1,[include extended update routine])
+fi
+
+AC_ARG_WITH(stb-hal-includes,
+	[  --with-stb-hal-includes=PATH  path for libstb-hal includes [[NONE]]],
+	[STB_HAL_INC="$withval"],[STB_HAL_INC=""])
+AC_ARG_WITH(stb-hal-build,
+	[  --with-stb-hal-build=PATH   path where libstb-hal is built [[NONE]]],
+	[STB_HAL_LIB="-L$withval"],[STB_HAL_LIB=""])
+
+AM_CONDITIONAL(USE_STB_HAL, test "$BOXTYPE" != "coolstream")
+if test "$BOXTYPE" != coolstream; then
+	AC_DEFINE(USE_STB_HAL, 1,[use libstb-hal])
+	if test "$STB_HAL_INC" = ""; then
+		AC_MSG_ERROR([need libstb-hal includes path with --with-stb-hal-includes=...])
+	fi
+	HWLIB_CFLAGS="-I$STB_HAL_INC"
+fi
+
 # Lua - embeddable scripting language
 AC_ARG_ENABLE(lua,
-	AS_HELP_STRING(--enable-lua,include Lua support),
-	,[enable_lua=no])
+	AS_HELP_STRING(--disable-lua,disable Lua support),
+	,[enable_lua=yes])
 
 AM_CONDITIONAL(ENABLE_LUA,test "$enable_lua" = "yes")
 if test "$enable_lua" = "yes"; then
@@ -170,6 +261,8 @@ if test "$enable_lua" = "yes"; then
 			AC_DEFINE(STATIC_LUAPOSIX,1,[Define to 1 for static lua build.])
 		])
 	])
+# hack...
+AC_DEFINE(LUA_COMPAT_5_2,1,[does not really belong in config.h, but is needed for build with lua 5.3+])
 fi
 
 AC_ARG_ENABLE(cleanup,
@@ -189,106 +282,134 @@ if test "$enable_testing" = "yes"; then
 	AC_DEFINE(ENABLE_TESTING,1,[include devel code parts for neutrino tests - not recommended for general users!])
 fi
 
+AC_ARG_ENABLE([fribidi],
+	AS_HELP_STRING([--enable-fribidi], [enable fribidi support])
+)
+AM_CONDITIONAL(ENABLE_FRIBIDI, test "$enable_fribidi" = "yes")
+AS_IF([test "$enable_fribidi" = "yes"],
+	AC_DEFINE(ENABLE_FRIBIDI, 1, [enable fribidi support])
+)
 
 if test "$BOXTYPE" = "coolstream"; then
-if test -e ${srcdir}/lib/libcoolstream/nevis_ir.h; then
+if test -e ${srcdir}/lib/hardware/coolstream/hd1/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/hardware/coolstream/hd1/libcoolstream'
 
-if test "$BOXMODEL" = "apollo"; then
-if test -e ${srcdir}/lib/libcoolstream2/cs_ir_generic.h; then
+if test "$BOXMODEL" = "hd2"; then
+if test -e ${srcdir}/lib/hardware/coolstream/hd2/libcoolstream/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
-if test -e ${srcdir}/lib/libcoolstream2/cs_frontpanel.h; then
+if test -e ${srcdir}/lib/hardware/coolstream/hd2/libcoolstream/cs_frontpanel.h; then
 	AC_DEFINE(HAVE_COOLSTREAM_CS_FRONTPANEL_H,1,[Define to 1 if you have the <cs_frontpanel.h> header file.])
 fi
+HWLIB_CFLAGS='-I$(top_srcdir)/lib/hardware/coolstream/hd2/libcoolstream'
 fi
+HWLIB_CFLAGS="$HWLIB_CFLAGS "'-I$(top_srcdir)/src/zapit/include/private'
+HWLIB_CFLAGS="$HWLIB_CFLAGS "'-I$(top_srcdir)/lib/hardware/coolstream'
 fi
 
-#
-# Check for libtdservicedb - the new one - for testing only
-#
-#CSL_VERSION=0.0.1
-#FCSL_VERSION=`$PKG_CONFIG --modversion libcoolstream`
-#AC_MSG_CHECKING(for package libcoolstream >= $CSL_VERSION)
-#if $PKG_CONFIG --atleast-version $CSL_VERSION libcoolstream ; then
-      #AC_MSG_RESULT(found (version $FCSL_VERSION))
-      #LIBCS_CFLAGS=`$PKG_CONFIG --cflags libcoolstream`
-      #LIBCS_LIBS=`$PKG_CONFIG --libs libcoolstream`
-#else
-      #AC_MSG_ERROR([
-#*** libcoolstream $CSL_VERSION or newer is required! ***
-  #])
-#fi
-AC_SUBST(LIBCS_CFLAGS)
-AC_SUBST(LIBCS_LIBS)
+# hack, so that framebuffer.h does not need to be included everywhere...
+AC_DEFINE(fb_pixel_t, uint32_t, [hack, so that framebuffer.h does not need to be included everywhere...])
+
+# hack to define a short filename also for out-of-tree build
+if test `dirname $0` = `pwd` || test "$0" = ./configure; then
+	HWLIB_CFLAGS="$HWLIB_CFLAGS "'-D__file__=__FILE__'
+	HWLIB_CFLAGS="$HWLIB_CFLAGS "'-D__path_file__=__FILE__'
+else
+	HWLIB_CFLAGS="$HWLIB_CFLAGS "'-D__file__="\"$(subst $(srcdir)/,,$(abspath $<))\""'
+	HWLIB_CFLAGS="$HWLIB_CFLAGS "'-D__path_file__="\"$(subst $(top_srcdir)/,,$(abspath $<))\""'
+fi
+
+AC_SUBST(HWLIB_CFLAGS)
 AC_SUBST(FREETYPE_CFLAGS)
 AC_SUBST(FREETYPE_LIBS)
 AC_SUBST(VORBISIDEC_CFLAGS)
 AC_SUBST(VORBISIDEC_LIBS)
+AC_SUBST(STB_HAL_INC)
+AC_SUBST(STB_HAL_LIB)
 AC_SUBST(LUA_CFLAGS)
 AC_SUBST(LUA_LIBS)
 AC_SUBST(BLURAY_LIBS)
 
 AC_OUTPUT([
 Makefile
-lib/Makefile
-lib/libconfigfile/Makefile
-lib/connection/Makefile
-lib/libeventserver/Makefile
-lib/libmd5sum/Makefile
-lib/libnet/Makefile
-lib/xmltree/Makefile
-lib/sectionsdclient/Makefile
-lib/timerdclient/Makefile
-lib/libtriple/Makefile
-lib/libtuxtxt/Makefile
-lib/libdvbsub/Makefile
-lib/libupnpclient/Makefile
-lib/libiw/Makefile
-lib/luaclient/Makefile
-src/lcddisplay/Makefile
-src/nhttpd/Makefile
-src/nhttpd/web/Makefile
-src/nhttpd/web/images/Makefile
-src/nhttpd/web/scripts/Makefile
-src/nhttpd/web/languages/Makefile
-src/nhttpd/web/styles/Makefile
-src/nhttpd/tuxboxapi/Makefile
-src/nhttpd/tuxboxapi/coolstream/Makefile
-src/nhttpd/yhttpd_core/Makefile
-src/nhttpd/yhttpd_mods/Makefile
-src/nhttpd/nhttpd.conf
-src/Makefile
-src/daemonc/Makefile
-src/driver/pictureviewer/Makefile
-src/driver/audiodec/Makefile
-src/driver/Makefile
-src/gui/Makefile
-src/gui/bedit/Makefile
-src/gui/components/Makefile
-src/gui/widget/Makefile
-src/system/Makefile
-src/system/mtdutils/Makefile
-src/system/mtdutils/lib/Makefile
 data/Makefile
 data/fonts/Makefile
 data/icons/Makefile
+data/icons/buttons/Makefile
+data/icons/filetypes/Makefile
+data/icons/headers/Makefile
+data/icons/hints/Makefile
+data/icons/locale/Makefile
+data/icons/movieplayer/Makefile
+data/icons/radar/Makefile
+data/icons/slider/Makefile
+data/icons/status/Makefile
+data/icons/status/ca/Makefile
+data/icons/status/channel/Makefile
+data/icons/status/markers/Makefile
+data/icons/status/various/Makefile
+data/icons/various/Makefile
 data/inetradio/Makefile
 data/initial/Makefile
 data/iso-codes/Makefile
 data/lcd/Makefile
-data/lcd/icons/Makefile
 data/lcd/clock/Makefile
+data/lcd/icons/Makefile
 data/license/Makefile
 data/locale/Makefile
 data/neutrino-scripts/Makefile
+data/pictures/Makefile
+data/pictures/backgrounds/Makefile
+data/pictures/screensaver/Makefile
 data/scripts/Makefile
 data/themes/Makefile
+data/y-web/Makefile
+data/y-web/images/Makefile
+data/y-web/languages/Makefile
+data/y-web/scripts/Makefile
+data/y-web/styles/Makefile
+lib/Makefile
+lib/connection/Makefile
+lib/hardware/coolstream/Makefile
+lib/jsoncpp/Makefile
+lib/libconfigfile/Makefile
+lib/libdvbsub/Makefile
+lib/libeventserver/Makefile
+lib/libiw/Makefile
+lib/libmd5sum/Makefile
+lib/libnet/Makefile
+lib/libtuxtxt/Makefile
+lib/libupnpclient/Makefile
+lib/luaclient/Makefile
+lib/sectionsdclient/Makefile
+lib/timerdclient/Makefile
+lib/xmltree/Makefile
+src/Makefile
+src/daemonc/Makefile
+src/driver/Makefile
+src/driver/audiodec/Makefile
+src/driver/pictureviewer/Makefile
 src/eitd/Makefile
+src/gui/Makefile
+src/gui/bedit/Makefile
+src/gui/components/Makefile
+src/gui/lua/Makefile
+src/gui/moviebrowser/Makefile
+src/gui/widget/Makefile
+src/lcddisplay/Makefile
+src/nhttpd/Makefile
+src/nhttpd/nhttpd.conf
+src/nhttpd/tuxboxapi/Makefile
+src/nhttpd/yhttpd_core/Makefile
+src/nhttpd/yhttpd_mods/Makefile
+src/system/Makefile
+src/system/mtdutils/Makefile
+src/system/mtdutils/lib/Makefile
 src/timerd/Makefile
 src/zapit/Makefile
+src/zapit/data/Makefile
 src/zapit/lib/Makefile
 src/zapit/src/Makefile
-src/zapit/data/Makefile
 ])

data/Makefile.am

@@ -1,11 +1,23 @@
-SUBDIRS = fonts icons inetradio initial iso-codes license locale scripts themes neutrino-scripts
+SUBDIRS = \
+	fonts \
+	icons \
+	inetradio \
+	initial \
+	iso-codes \
+	license \
+	locale \
+	neutrino-scripts \
+	pictures \
+	scripts \
+	themes \
+	y-web
 
 if BOXTYPE_TRIPLE
 SUBDIRS += lcd
 endif
 
 configdir = $(CONFIGDIR)
-config_DATA = cables.xml satellites.xml encoding.conf tobackup.conf providermap.xml settingsupdate.conf terrestrial.xml
+config_DATA = cables.xml satellites.xml encoding.conf tobackup.conf providermap.xml settingsupdate.conf terrestrial.xml bad_package_pattern.list.sample
 
 install-data-hook:
 	$(INSTALL) -d $(DESTDIR)/$(CONFIGDIR)/zapit

data/bad_package_pattern.list.sample

@@ -0,0 +1,11 @@
+-dev$
+-doc$
+-dbg$
+-ptest$
+-staticdev$
+-locale-
+-charmap-
+-gconv-
+-localedata-
+^locale-base-
+^perl-module-

data/cables.xml

@@ -220,9 +220,61 @@
 		<transponder frequency="698000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 	</cable>
 	<cable name="Unitymedia" satfeed="true" flags="9">
-		<transponder frequency="113000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="121000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="129000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="114000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="122000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="130000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="138000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="146000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="154000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="162000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="170000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="346000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="354000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="362000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="370000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="378000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="386000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="394000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="402000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="410000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="418000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="426000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="434000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="442000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="450000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="458000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="466000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="474000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="482000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="490000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="498000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="522000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="610000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="746000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<transponder frequency="754000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<transponder frequency="762000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<transponder frequency="770000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<transponder frequency="778000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<transponder frequency="786000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<transponder frequency="794000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<transponder frequency="802000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="810000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<transponder frequency="818000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<transponder frequency="826000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<transponder frequency="834000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<transponder frequency="842000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<transponder frequency="850000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="858000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+	</cable>
+	<cable name="Kabel BW" satfeed="true" flags="9">
+		<transponder frequency="114000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="122000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="130000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="138000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="146000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="154000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="162000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="170000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="346000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="354000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="362000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
@@ -247,56 +299,6 @@
 		<transponder frequency="562000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="570000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="610000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="682000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="690000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="698000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="706000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="730000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="738000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="746000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="754000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="762000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="770000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="778000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="786000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="794000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="802000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="810000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="818000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="826000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="834000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-	</cable>
-	<cable name="Kabel BW" satfeed="true" flags="9">
-		<transponder frequency="114000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="122000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="130000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="346000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="354000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="362000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="370000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="378000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="386000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="394000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="402000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="410000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="418000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="426000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="434000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="442000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="450000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="458000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="466000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="546000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="554000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="562000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="570000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="610000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="682000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="690000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="698000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="706000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="730000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="738000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="746000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="754000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
 		<transponder frequency="762000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
@@ -440,10 +442,10 @@
 		<transponder frequency="786000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 	</cable>
 	<cable name="WTC SN" satfeed="true" flags="9">
-		<transponder frequency="306000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
 		<transponder frequency="113000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="121000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="129000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="130000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="306000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
 		<transponder frequency="314000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
 		<transponder frequency="322000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
 		<transponder frequency="330000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
@@ -454,15 +456,21 @@
 		<transponder frequency="370000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="378000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="386000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="394000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="402000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="410000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="418000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="426000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="434000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="442000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="450000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="458000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="466000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<transponder frequency="434000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="442000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="450000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="458000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="466000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="474000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="482000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="490000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="498000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="506000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="514000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="522000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="530000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
@@ -471,6 +479,11 @@
 		<transponder frequency="554000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="562000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="570000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="586000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="786000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="794000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="802000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="810000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 	</cable>
 	<cable name="Goeltzschtalbruecke" satfeed="true" flags="9">
 		<transponder frequency="234000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
@@ -487,11 +500,11 @@
 		<transponder frequency="322000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="330000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="338000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="346000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
-		<transponder frequency="354000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
-		<transponder frequency="362000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
-		<transponder frequency="370000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
-		<transponder frequency="378000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
+		<transponder frequency="346000" symbol_rate="6875000" fec_inner="0" modulation="5"/>
+		<transponder frequency="354000" symbol_rate="6875000" fec_inner="0" modulation="5"/>
+		<transponder frequency="362000" symbol_rate="6875000" fec_inner="0" modulation="5"/>
+		<transponder frequency="370000" symbol_rate="6875000" fec_inner="0" modulation="5"/>
+		<transponder frequency="378000" symbol_rate="6875000" fec_inner="0" modulation="5"/>
 		<transponder frequency="386000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
 		<transponder frequency="394000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
 		<transponder frequency="402000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
@@ -503,22 +516,28 @@
 		<transponder frequency="450000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
 		<transponder frequency="458000" symbol_rate="6111000" fec_inner="0" modulation="3"/>
 		<transponder frequency="466000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
-		<transponder frequency="474000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="482000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<transponder frequency="474000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="482000" symbol_rate="6111000" fec_inner="0" modulation="3"/>
 		<transponder frequency="490000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
 		<transponder frequency="498000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
 		<transponder frequency="506000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
 		<transponder frequency="514000" symbol_rate="6111000" fec_inner="0" modulation="3"/>
 		<transponder frequency="522000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="530000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="538000" symbol_rate="6790000" fec_inner="0" modulation="3"/>
-		<transponder frequency="546000" symbol_rate="6110000" fec_inner="0" modulation="3"/>
+		<transponder frequency="530000" symbol_rate="6111000" fec_inner="0" modulation="3"/>
+		<transponder frequency="538000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="546000" symbol_rate="6111000" fec_inner="0" modulation="3"/>
 		<transponder frequency="554000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
 		<transponder frequency="562000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="570000" symbol_rate="6110000" fec_inner="0" modulation="3"/>
+		<transponder frequency="570000" symbol_rate="6111000" fec_inner="0" modulation="3"/>
 		<transponder frequency="578000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="586000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="594000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="602000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="610000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="618000" symbol_rate="6111000" fec_inner="0" modulation="3"/>
+		<transponder frequency="626000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="634000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="642000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 	</cable>
 	<cable name="Antennengemeinschaft Penig" satfeed="true" flags="9">
 		<transponder frequency="129000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
@@ -548,44 +567,46 @@
 		<transponder frequency="546000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 	</cable>
 	<cable name="Antennenverein Hohenmoelsen" satfeed="true" flags="9">
-		<transponder frequency="113000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="121000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="129000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="137000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="145000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="153000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="161000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="169000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="177000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="185000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="193000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="201000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="209000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="217000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="256000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="264000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="272000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="280000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="288000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="296000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="114000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="122000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<transponder frequency="130000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<transponder frequency="138000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<transponder frequency="146000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<transponder frequency="178000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<transponder frequency="186000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<transponder frequency="194000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<transponder frequency="202000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<transponder frequency="210000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<transponder frequency="218000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="226000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="234000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="242000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="250000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="258000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="266000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="274000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="282000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<transponder frequency="290000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<transponder frequency="298000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="306000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="314000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="322000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="330000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="338000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<transponder frequency="322000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="330000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="338000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="346000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
 		<transponder frequency="354000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="362000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="370000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="378000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="386000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="394000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="402000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="410000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="418000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="426000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="434000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="442000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<transponder frequency="362000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="370000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="378000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="386000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="394000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="402000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="410000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="418000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="426000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="434000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="442000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="450000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 	</cable>
 	<cable name="M-net" satfeed="true" flags="9">
 		<transponder frequency="114000" symbol_rate="6900000" fec_inner="0" modulation="5"/>

data/epgmap.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<zapit>
+	<filter channel_id="b85a1450013e0d49" new_epg_id="ac423070013e213f"/> --rai1
+	<filter channel_id="b12003ee00011072" new_epg_id="ac423070013e213f"/> --rai1
+
+	<filter channel_id="ac9630d4013e4530" new_epg_id="ac423070013e2140"/> --rai2
+	<filter channel_id="b12003ee00011073" new_epg_id="ac423070013e2140"/> --rai2
+
+	<filter channel_id="b12003ee00011074" new_epg_id="ac423070013e2141"/> --rai3
+	<filter channel_id="ac9630d4013e4531" new_epg_id="ac423070013e2141"/> --rai3
+
+	<filter channel_id="ac9630d4013e4534" new_epg_id="ac423070013e2142"/> --rai4
+
+	<filter channel_id="ac9630d4013e4533" new_epg_id="ac421518013e0ce9"/> --raisport1
+	<filter channel_id="b12003ee00011078" new_epg_id="ac423070013e2144"/> --rainews24
+
+	<filter channel_id="b4d6070800c80e26" new_epg_id="b45803fb0001283d"/> --Das Erste
+</zapit>

data/fonts/Makefile.am

@@ -11,6 +11,6 @@ install_DATA = \
 	tuxtxt.ttf \
 	tuxtxt.otb
 
-if BOXMODEL_APOLLO
+if BOXMODEL_CS_HD2
 install_DATA += UnDotum.ttf
 endif

data/icons/Makefile.am

@@ -1,273 +1,14 @@
-installdir = $(DATADIR)/neutrino/icons
-
-locale = \
-	locale/deutsch.png \
-	locale/english.png
-
-locale_unmaintained = \
-	locale/unmaintained/bayrisch.png \
-	locale/unmaintained/bosanski.png \
-	locale/unmaintained/ch-baslerdeutsch.png \
-	locale/unmaintained/ch-berndeutsch.png \
-	locale/unmaintained/czech.png \
-	locale/unmaintained/francais.png \
-	locale/unmaintained/italiano.png \
-	locale/unmaintained/nederlands.png \
-	locale/unmaintained/polski.png \
-	locale/unmaintained/portugues.png \
-	locale/unmaintained/russkij.png \
-	locale/unmaintained/slovak.png \
-	locale/unmaintained/suomi.png \
-	locale/unmaintained/svenska.png
-
-install_DATA  = $(locale)
-install_DATA += $(locale_unmaintained)
-
-install_DATA += \
-	0.png \
-	1.png \
-	16_9.png \
-	16_9_gray.png \
-	2.png \
-	3.png \
-	4.png \
-	5.png \
-	6.png \
-	7.png \
-	8.png \
-	9.png \
-	ats.png \
-	ats_gray.png \
-	audio.png \
-	audioplay.png \
-	biss_green.png \
-	biss_white.png \
-	biss_yellow.png \
-	blau.png \
-	bookmarkmanager.png \
-	border_lr.png \
-	border_ul.png \
-	btn_backward.png \
-	btn_forward.png \
-	btn_pause.png \
-	btn_play.png \
-	btn_record_active.png \
-	btn_record_inactive.png \
-	btn_stop.png \
-	ca.png \
-	ca2.png \
-	ca2_gray.png \
-	checkmark.png \
-	colors.png \
-	conax_green.png \
-	conax_white.png \
-	conax_yellow.png \
-	cw_green.png \
-	cw_white.png \
-	cw_yellow.png \
-	d_green.png \
-	d_white.png \
-	d_yellow.png \
-	dd.png \
-	dd_avail.png \
-	dd_gray.png \
-	down.png \
-	dummy.png \
-	dummy_small.png \
-	error.png \
-	epg.png \
-	features.png \
-	file.png \
-	folder.png \
-	games.png \
-	gelb.png \
-	gruen.png \
-	help.png \
-	help_small.png \
-	hidden.png \
-	hint_a_pic.png \
-	hint_aplay.png \
-	hint_audio.png \
-	hint_back.png \
-	hint_bedit.png \
-	hint_ci.png \
-	hint_dboxinfo.png \
-	hint_delete.png \
-	hint_extended.png \
-	hint_fileplay.png \
-	hint_games.png \
-	hint_hdd.png \
-	hint_imageinfo.png \
-	hint_inetradio.png \
-	hint_info.png \
-	hint_keys.png \
-	hint_language.png \
-	hint_manage.png \
-	hint_mb.png \
-	hint_media.png \
-	hint_movie.png \
-	hint_network.png \
-	hint_osd.png \
-	hint_personalize.png \
-	hint_picview.png \
-	hint_plugin.png \
-	hint_protection.png \
-	hint_radiomode.png \
-	hint_reboot.png \
-	hint_recording.png \
-	hint_reload.png \
-	hint_restart.png \
-	hint_save.png \
-	hint_scan.png \
-	hint_scripts.png \
-	hint_service.png \
-	hint_settings.png \
-	hint_shutdown.png \
-	hint_sleeptimer.png \
-	hint_streaminfo.png \
-	hint_swupdate.png \
-	hint_timers.png \
-	hint_tvmode.png \
-	hint_tvradio_switch.png \
-	hint_vfd.png \
-	hint_video.png \
-	hint_ytplay.png \
-	home.png \
-	icon_green.png \
-	icon_movieplayer.png \
-	icon_red.png \
-	icon_yellow.png \
-	icon_ytplay.png \
-	important.png \
-	info.png \
-	info_small.png \
-	information.png \
-	ird_green.png \
-	ird_white.png \
-	ird_yellow.png \
-	keybinding.png \
-	language.png \
-	lcd.png \
-	left.png \
-	local.png \
-	lock.png \
-	lock_passive.png \
-	mainmenue.png \
-	menu.png \
-	menu_small.png \
-	mounted.png \
-	movie.png \
-	mp_b-skip.png \
-	mp_f-skip.png \
-	mp_pause.png \
-	mp_play.png \
-	mp_play_repeat_all.png \
-	mp_play_repeat_track.png \
-	mp3.jpg \
-	mp3.png \
-	mp3-0.jpg \
-	mp3-1.jpg \
-	mp3-2.jpg \
-	mp3-3.jpg \
-	mp3-4.jpg \
-	mp3-5.jpg \
-	mp3-6.jpg \
-	mp3-7.jpg \
-	multimedia.png \
-	mute.png \
-	mute_small.png \
-	mute_zap_gray.png \
-	mute_zap_green.png \
-	nagra_green.png \
-	nagra_white.png \
-	nagra_yellow.png \
-	nds_green.png \
-	nds_white.png \
-	nds_yellow.png \
-	network.png \
-	not_mounted.png \
-	notyet.png \
-	numericpad.png \
-	ok.png \
-	personalize.png \
-	pip.png \
-	power.png \
-	powervu_green.png \
-	powervu_white.png \
-	powervu_yellow.png \
-	radar.pal \
-	radar_red.pal \
-	radar0.raw \
-	radar1.raw \
-	radar2.raw \
-	radar3.raw \
-	radar4.raw \
-	radar5.raw \
-	radar6.raw \
-	radar7.raw \
-	radar8.raw \
-	radar9.raw \
-	radiomode.jpg \
-	radiotextget.png \
-	radiotextoff.png \
-	radiotextwait.png \
-	rec.png \
-	rec_event_marker.png \
-	rec_gray.png \
-	recording.png \
-	res_000.png \
-	res_1080.png \
-	res_1280.png \
-	res_1440.png \
-	res_1920.png \
-	res_288.png \
-	res_352.png \
-	res_382.png \
-	res_480.png \
-	res_528.png \
-	res_544.png \
-	res_576.png \
-	res_704.png \
-	res_720.png \
-	res_hd.png \
-	res_sd.png \
-	right.png \
-	rot.png \
-	scan.jpg \
-	seca_green.png \
-	seca_white.png \
-	seca_yellow.png \
-	settings.png \
-	shell.png \
-	shutdown.jpg \
-	softupdate.png \
-	start.jpg \
-	streaming.png \
-	subt.png \
-	subt_gray.png \
-	timer.png \
-	tuner_1.png \
-	tuner_2.png \
-	tuner_3.png \
-	tuner_4.png \
-	up.png \
-	upnp.png \
-	via_green.png \
-	via_white.png \
-	via_yellow.png \
-	video.png \
-	volume.png \
-	volumebody.png \
-	volumeslider2.png \
-	volumeslider2alpha.png \
-	volumeslider2blue.png \
-	volumeslider2green.png \
-	volumeslider2red.png \
-	vtxt.png \
-	vtxt_gray.png \
-	warning.png \
-	x_green.png \
-	x_white.png \
-	x_yellow.png \
-	zap.png
+SUBDIRS = \
+	buttons \
+	filetypes \
+	headers \
+	hints \
+	locale \
+	movieplayer \
+	radar \
+	slider \
+	status \
+	various
 
+install-data-hook:
+	$(INSTALL) -d $(DESTDIR)/$(ICONSDIR)/logo

data/icons/buttons/Makefile.am

@@ -0,0 +1,42 @@
+installdir = $(ICONSDIR)
+
+install_DATA = \
+	0.png \
+	1.png \
+	2.png \
+	3.png \
+	4.png \
+	5.png \
+	6.png \
+	7.png \
+	8.png \
+	9.png \
+	blau.png \
+	btn_backward.png \
+	btn_forward.png \
+	btn_pause.png \
+	btn_play.png \
+	btn_record_active.png \
+	btn_record_inactive.png \
+	btn_stop.png \
+	down.png \
+	dummy.png \
+	dummy_small.png \
+	gelb.png \
+	gruen.png \
+	help.png \
+	help_small.png \
+	home.png \
+	info.png \
+	info_small.png \
+	left.png \
+	menu.png \
+	menu_small.png \
+	mute_small.png \
+	mute_zap_gray.png \
+	mute_zap_green.png \
+	ok.png \
+	power.png \
+	right.png \
+	rot.png \
+	up.png