update to version 3.9.0

switch to changed libst-hal structur. libstb-hal >= 1.1.0 is required

.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

.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,4 @@
-AUTOMAKE_OPTIONS = gnu
-
 SUBDIRS = lib src data
+
+locale-update:
+	make -C $(top_builddir)/data/locale install-locals

acinclude.m4

@@ -1,31 +1,137 @@
-AC_DEFUN([TUXBOX_APPS],[
+AC_DEFUN([TUXBOX_APPS], [
 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]]],
-	[TARGET="$withval"],[TARGET="native"])
+	AS_HELP_STRING([--with-target=TARGET], [target for compilation [[native,cdk]]]),
+	[TARGET="$withval"],
+	[TARGET="native"])
 
 AC_ARG_WITH(targetprefix,
-	[  --with-targetprefix=PATH  prefix relative to target root (only applicable in cdk mode)],
-	[TARGET_PREFIX="$withval"],[TARGET_PREFIX="NONE"])
+	AS_HELP_STRING([--with-targetprefix=PATH], [prefix relative to target root (only applicable in cdk mode)]),
+	[TARGET_PREFIX="$withval"],
+	[TARGET_PREFIX=""])
 
 AC_ARG_WITH(debug,
-	[  --without-debug         disable debugging code],
-	[DEBUG="$withval"],[DEBUG="yes"])
+	AS_HELP_STRING([--without-debug], [disable debugging code @<:@default=no@:>@]),
+	[DEBUG="$withval"],
+	[DEBUG="yes"])
 
 if test "$DEBUG" = "yes"; then
 	DEBUG_CFLAGS="-g3 -ggdb"
-	AC_DEFINE(DEBUG,1,[Enable debug messages])
+	AC_DEFINE(DEBUG, 1, [enable debugging code])
 fi
 
-AC_ARG_ENABLE(tmsdk,
-        AS_HELP_STRING(--enable-tmsdk,         compile inside sdk),
-        ,[enable_tmsdk=no])
-AM_CONDITIONAL(ENABLE_TMSDK,test "$enable_tmsdk" = "yes")
+
+# tmdb
+AC_ARG_WITH(tmdb-dev-key,
+	AS_HELP_STRING([--with-tmdb-dev-key=KEY], [API dev key to get data from tmdb data base, required for additional epg informations.]),
+	[TMDB_DEV_KEY="$withval"],
+	[TMDB_DEV_KEY=""])
+AC_DEFINE_UNQUOTED([TMDB_DEV_KEY], ["$TMDB_DEV_KEY"], [API dev key to get data from tmdb data base, required for additional epg informations.])
+
+
+AC_ARG_ENABLE([tmdb-key-manage],
+	[AS_HELP_STRING([--enable-tmdb-key-manage], [Enable manage tmdb api dev key via gui for additional epg informations. @<:@default=yes@:>@])],
+	[enable_tmdb_key_manage="$enableval"],
+	[enable_tmdb_key_manage="yes"])
+tmdb_key_manage_val=1
+if test "$enable_tmdb_key_manage" = "no" ; then
+	tmdb_key_manage_val=0
+fi
+AC_DEFINE_UNQUOTED([ENABLE_TMDB_KEY_MANAGE],[$tmdb_key_manage_val],[Enable manage tmdb api dev key via gui for additional epg informations.])
+# end tmdb
+
+
+# omdb
+AC_ARG_WITH(omdb-api-key,
+	AS_HELP_STRING([--with-omdb-api-key=KEY], [API key to get additional epg data from omdb database at http://www.omdbapi.com, this database gets data from imdb service.]),
+	[OMDB_API_KEY="$withval"],
+	[OMDB_API_KEY=""])
+AC_DEFINE_UNQUOTED([OMDB_API_KEY], ["$OMDB_API_KEY"], [API key to get additional epg data from omdb database at http://www.omdbapi.com, this database gets data from imdb service.])
+
+AC_ARG_ENABLE([omdb-key-manage],
+	[AS_HELP_STRING([--enable-omdb-key-manage], [Enable manage omdb (imdb) api dev key via gui for additional epg informations. @<:@default=yes@:>@])],
+	[enable_omdb_key_manage="$enableval"],
+	[enable_omdb_key_manage="yes"])
+omdb_key_manage_val=1
+if test "$enable_omdb_key_manage" = "no" ; then
+	omdb_key_manage_val=0
+fi
+AC_DEFINE_UNQUOTED([ENABLE_OMDB_KEY_MANAGE],[$omdb_key_manage_val],[Enable manage omdb (imdb) api dev key via gui for additional epg informations.])
+# end omdb
+
+
+# youtube
+AC_ARG_WITH(youtube-dev-key,
+	AS_HELP_STRING([--with-youtube-dev-key=KEY], [API dev key for YouTube streaming.]),
+	[YT_DEV_KEY="$withval"],
+	[YT_DEV_KEY=""])
+AC_DEFINE_UNQUOTED([YT_DEV_KEY], ["$YT_DEV_KEY"], [API dev key for YouTube streaming.])
+
+AC_ARG_ENABLE([youtube-key-manage],
+	[AS_HELP_STRING([--enable-youtube-key-manage], [Enable manage youtube dev key via gui for additional epg informations. @<:@default=yes@:>@])],
+	[enable_youtube_key_manage="$enableval"],
+	[enable_youtube_key_manage="yes"])
+youtube_key_manage_val=1
+if test "$enable_youtube_key_manage" = "no" ; then
+	youtube_key_manage_val=0
+fi
+AC_DEFINE_UNQUOTED([ENABLE_YOUTUBE_KEY_MANAGE],[$youtube_key_manage_val], [Enable manage youtube dev key via gui for additional epg informations.])
+
+AC_ARG_ENABLE([youtube-player],
+	[AS_HELP_STRING([--enable-youtube-player], [Enable play and control youtube streams with moviebrowser. @<:@default=yes@:>@])],
+	[enable_youtube_player="$enableval"],
+	[enable_youtube_player="yes"])
+youtube_player_val=1
+if test "$enable_youtube_player" = "no" ; then
+	youtube_player_val=0
+fi
+AC_DEFINE_UNQUOTED([ENABLE_YOUTUBE_PLAYER],[$youtube_player_val], [Enable play and control YouTube streams with moviebrowser.])
+# end youtube
+
+
+# shoutcast
+AC_ARG_WITH(shoutcast-dev-key,
+	AS_HELP_STRING([--with-shoutcast-dev-key=KEY], [API dev key to get stream data lists from ShoutCast service.]),
+	[SHOUTCAST_DEV_KEY="$withval"],
+	[SHOUTCAST_DEV_KEY=""])
+AC_DEFINE_UNQUOTED([SHOUTCAST_DEV_KEY], ["$SHOUTCAST_DEV_KEY"], [API dev key to get stream data lists from ShoutCast service.])
+
+AC_ARG_ENABLE([shoutcast-key-manage],
+	[AS_HELP_STRING([--enable-shoutcast-key-manage], [Enable manage of api dev key to get stream data lists from ShoutCast service via gui. @<:@default=yes@:>@])],
+	[enable_shoutcast_key_manage="$enableval"],
+	[enable_shoutcast_key_manage="yes"])
+shoutcast_key_manage_val=1
+if test "$enable_shoutcast_key_manage" = "no" ; then
+	shoutcast_key_manage_val=0
+fi
+AC_DEFINE_UNQUOTED([ENABLE_SHOUTCAST_KEY_MANAGE],[$shoutcast_key_manage_val], [Enable manage of api dev key to get stream data lists from ShoutCast service via gui.])
+# end shoutcast
+
+
+AC_ARG_WITH(libcoolstream-static-dir,
+	AS_HELP_STRING([--with-libcoolstream-static-dir=PATH], [path for static libcoolstream [[NONE]]]),
+	[LIBCOOLSTREAM_STATIC_DIR="$withval"],
+	[LIBCOOLSTREAM_STATIC_DIR=""])
+
+AC_ARG_ENABLE(libcoolstream-static,
+	AS_HELP_STRING([--enable-libcoolstream-static], [libcoolstream static linked for testing @<:@default=no@:>@]))
+AM_CONDITIONAL(ENABLE_LIBCOOLSTREAM_STATIC, test "$enable_libcoolstream_static" = "yes")
+
+AC_ARG_ENABLE(reschange,
+	AS_HELP_STRING([--enable-reschange], [enable change the osd resolution @<:@default for hd2 and hd51@:>@]),
+	AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION, 1, [enable change the osd resolution]))
+AM_CONDITIONAL(ENABLE_RESCHANGE, test "$enable_reschange" = "yes")
+
+# default theme
+AC_ARG_WITH(default-theme,
+	AS_HELP_STRING([--with-default-theme=THEMENAME], [Default theme for gui. Default it is empty for internal fallback to default colors.]),
+	[default_theme="$withval"],
+	[default_theme=""])
+AC_DEFINE_UNQUOTED([DEFAULT_THEME], ["$default_theme"], [Default theme for gui.])
 
 AC_MSG_CHECKING(target)
 
@@ -39,35 +145,31 @@ if test "$TARGET" = "native"; then
 	if test "$prefix" = "NONE"; then
 		prefix=/usr/local
 	fi
-	TARGET_PREFIX=$prefix
 	if test "$exec_prefix" = "NONE"; then
 		exec_prefix=$prefix
 	fi
 	targetprefix=$prefix
+	TARGET_PREFIX=$prefix
+	AC_DEFINE_UNQUOTED(TARGET_PREFIX, "$TARGET_PREFIX", [The targets prefix])
 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])
 	fi
 	if test "$TARGET_PREFIX" != "NONE"; then
-		AC_DEFINE_UNQUOTED(TARGET_PREFIX, "$TARGET_PREFIX",[The targets prefix])
+		AC_DEFINE_UNQUOTED(TARGET_PREFIX, "$TARGET_PREFIX", [The targets prefix])
 	fi
 	if test "$TARGET_PREFIX" = "NONE"; 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,17 +177,18 @@ fi
 
 AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
+AC_SYS_LARGEFILE
 
-check_path () {
+check_path() {
 	return $(perl -e "if(\"$1\"=~m#^/usr/(local/)?bin#){print \"0\"}else{print \"1\";}")
 }
 
 ])
 
 dnl expand nested ${foo}/bar
-AC_DEFUN([TUXBOX_EXPAND_VARIABLE],[__$1="$2"
+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}"
@@ -93,8 +196,8 @@ AC_DEFUN([TUXBOX_EXPAND_VARIABLE],[__$1="$2"
 	$__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]]],[
+AC_DEFUN([TUXBOX_APPS_DIRECTORY_ONE], [
+AC_ARG_WITH($1, AS_HELP_STRING([$6], [$7 [[PREFIX$4$5]]], [32], [79]), [
 	_$2=$withval
 	if test "$TARGET" = "cdk"; then
 		$2=`eval echo "$TARGET_PREFIX$withval"` # no indirection possible IMNSHO
@@ -102,7 +205,7 @@ AC_ARG_WITH($1,[  $6$7 [[PREFIX$4$5]]],[
 		$2=$withval
 	fi
 	TARGET_$2=${$2}
-],[
+], [
 	# RFC 1925: "you can always add another level of indirection..."
 	TUXBOX_EXPAND_VARIABLE($2,"${$3}$5")
 	if test "$TARGET" = "cdk"; then
@@ -112,13 +215,12 @@ AC_ARG_WITH($1,[  $6$7 [[PREFIX$4$5]]],[
 	fi
 	TARGET_$2=$_$2
 ])
-
 dnl AC_SUBST($2)
 AC_DEFINE_UNQUOTED($2,"$_$2",$7)
 AC_SUBST(TARGET_$2)
 ])
 
-AC_DEFUN([TUXBOX_APPS_DIRECTORY],[
+AC_DEFUN([TUXBOX_APPS_DIRECTORY], [
 AC_REQUIRE([TUXBOX_APPS])
 
 if test "$TARGET" = "cdk"; then
@@ -132,154 +234,111 @@ 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])
+TUXBOX_APPS_DIRECTORY_ONE(configdir, CONFIGDIR, localstatedir, /var, /tuxbox/config,
+	[--with-configdir=PATH], [where to find config files])
 
-TUXBOX_APPS_DIRECTORY_ONE(datadir,DATADIR,datadir,/share,/tuxbox,
-	[--with-datadir=PATH           ],[where to find data])
+TUXBOX_APPS_DIRECTORY_ONE(datadir, DATADIR, datadir, /share, /tuxbox,
+	[--with-datadir=PATH], [where to find data files])
 
-TUXBOX_APPS_DIRECTORY_ONE(fontdir,FONTDIR,datadir,/share,/fonts,
-	[--with-fontdir=PATH           ],[where to find the fonts])
+TUXBOX_APPS_DIRECTORY_ONE(fontdir, FONTDIR, datadir, /share, /fonts,
+	[--with-fontdir=PATH], [where to find fonts])
 
-TUXBOX_APPS_DIRECTORY_ONE(gamesdir,GAMESDIR,localstatedir,/var,/tuxbox/games,
-	[--with-gamesdir=PATH          ],[where games data is stored])
+TUXBOX_APPS_DIRECTORY_ONE(fontdir_var, FONTDIR_VAR, localstatedir, /var, /tuxbox/fonts,
+	[--with-fontdir_var=PATH], [where to find fonts in /var])
 
-TUXBOX_APPS_DIRECTORY_ONE(libdir,LIBDIR,libdir,/lib,/tuxbox,
-	[--with-libdir=PATH            ],[where to find the internal libs])
+TUXBOX_APPS_DIRECTORY_ONE(gamesdir, GAMESDIR, localstatedir, /var, /tuxbox/games,
+	[--with-gamesdir=PATH], [where to find games])
 
-TUXBOX_APPS_DIRECTORY_ONE(plugindir,PLUGINDIR,libdir,/lib,/tuxbox/plugins,
-	[--with-plugindir=PATH         ],[where to find the plugins])
+TUXBOX_APPS_DIRECTORY_ONE(libdir, LIBDIR, libdir, /lib, /tuxbox,
+	[--with-libdir=PATH], [where to find internal libs])
 
-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(plugindir, PLUGINDIR, libdir, /lib, /tuxbox/plugins,
+	[--with-plugindir=PATH], [where to find plugins])
 
-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(plugindir_var, PLUGINDIR_VAR, localstatedir, /var, /tuxbox/plugins,
+	[--with-plugindir_var=PATH], [where to find plugins in /var])
 
-TUXBOX_APPS_DIRECTORY_ONE(luaplugindir,LUAPLUGINDIR,libdir,/lib,/tuxbox/luaplugins,
-	[--with-luaplugindir=PATH      ],[where to find Lua plugins])
+TUXBOX_APPS_DIRECTORY_ONE(plugindir_mnt, PLUGINDIR_MNT, mntdir, /mnt, /plugins,
+	[--with-plugindir_mnt=PATH], [where to find external plugins])
 
-TUXBOX_APPS_DIRECTORY_ONE(localedir,LOCALEDIR,datadir,/share, /tuxbox/neutrino/locale,
-	[--with-localedir=PATH         ],[where to find the locale])
+TUXBOX_APPS_DIRECTORY_ONE(luaplugindir, LUAPLUGINDIR, libdir, /lib, /tuxbox/luaplugins,
+	[--with-luaplugindir=PATH], [where to find Lua plugins])
 
-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(webradiodir, WEBRADIODIR, datadir, /share, /tuxbox/neutrino/webradio,
+	[--with-webradiodir=PATH], [where to find webradio content])
 
-TUXBOX_APPS_DIRECTORY_ONE(themesdir,THEMESDIR,datadir,/share, /tuxbox/neutrino/themes,
-	[--with-themesdir=PATH         ],[where to find the themes])
+TUXBOX_APPS_DIRECTORY_ONE(webradiodir_var, WEBRADIODIR_VAR, localstatedir, /var, /tuxbox/webradio,
+	[--with-webradiodir_var=PATH], [where to find webradio content in /var])
 
-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(webtvdir, WEBTVDIR, datadir, /share, /tuxbox/neutrino/webtv,
+	[--with-webtvdir=PATH], [where to find webtv content])
 
-TUXBOX_APPS_DIRECTORY_ONE(iconsdir,ICONSDIR,datadir,/share, /tuxbox/neutrino/icons,
-	[--with-iconsdir=PATH          ],[where to find the icons])
+TUXBOX_APPS_DIRECTORY_ONE(webtvdir_var, WEBTVDIR_VAR, localstatedir, /var, /tuxbox/webtv,
+	[--with-webtvdir_var=PATH], [where to find webtv content in /var])
 
-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(localedir, LOCALEDIR,datadir, /share, /tuxbox/neutrino/locale,
+	[--with-localedir=PATH], [where to find locale])
 
-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])
+TUXBOX_APPS_DIRECTORY_ONE(localedir_var, LOCALEDIR_VAR, localstatedir, /var, /tuxbox/locale,
+	[--with-localedir_var=PATH], [where to find locale in /var])
 
-TUXBOX_APPS_DIRECTORY_ONE(public_httpddir,PUBLIC_HTTPDDIR,localstatedir,/var,/httpd,
-	[--with-public_httpddir=PATH   ],[where to find the the public httpd files])
+TUXBOX_APPS_DIRECTORY_ONE(themesdir, THEMESDIR, datadir, /share, /tuxbox/neutrino/themes,
+	[--with-themesdir=PATH], [where to find themes])
 
-TUXBOX_APPS_DIRECTORY_ONE(hosted_httpddir,HOSTED_HTTPDDIR,mntdir,/mnt,/hosted,
-	[--with-hosted_httpddir=PATH   ],[where to find the the hosted files])
+TUXBOX_APPS_DIRECTORY_ONE(themesdir_var, THEMESDIR_VAR, localstatedir, /var, /tuxbox/themes,
+	[--with-themesdir_var=PATH], [where to find themes in /var])
+
+TUXBOX_APPS_DIRECTORY_ONE(iconsdir, ICONSDIR, datadir, /share, /tuxbox/neutrino/icons,
+	[--with-iconsdir=PATH], [where to find icons])
+
+TUXBOX_APPS_DIRECTORY_ONE(iconsdir_var, ICONSDIR_VAR, localstatedir, /var, /tuxbox/icons,
+	[--with-iconsdir_var=PATH], [where to find icons in /var])
+
+TUXBOX_APPS_DIRECTORY_ONE(private_httpddir, PRIVATE_HTTPDDIR, datadir, /share, /tuxbox/neutrino/httpd,
+	[--with-private_httpddir=PATH], [where to find private httpd files])
+
+TUXBOX_APPS_DIRECTORY_ONE(public_httpddir, PUBLIC_HTTPDDIR, localstatedir, /var, /tuxbox/httpd,
+	[--with-public_httpddir=PATH], [where to find public httpd files])
+
+TUXBOX_APPS_DIRECTORY_ONE(hosted_httpddir, HOSTED_HTTPDDIR, mntdir, /mnt, /hosted,
+	[--with-hosted_httpddir=PATH], [where to find hosted files])
+
+TUXBOX_APPS_DIRECTORY_ONE(flagdir, FLAGDIR, localstatedir, /var, /etc,
+	[--with-flagdir=PATH], [where to find flag 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(PLUGINDIR_MNT)
 AC_SUBST(LUAPLUGINDIR)
+AC_SUBST(WEBRADIODIR)
+AC_SUBST(WEBRADIODIR_VAR)
+AC_SUBST(WEBTVDIR)
+AC_SUBST(WEBTVDIR_VAR)
 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(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 -traditional-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 -traditional-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])
-])
-
-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_DEFUN([_TUXBOX_APPS_LIB_CONFIG], [
 AC_PATH_PROG($1_CONFIG,$2,no)
 if test "$$1_CONFIG" != "no"; then
 	if test "$TARGET" = "cdk" && check_path "$$1_CONFIG"; then
@@ -299,30 +358,34 @@ if test "$$1_CONFIG" != "no"; then
 		fi
 	fi
 fi
-
 AC_SUBST($1_CFLAGS)
 AC_SUBST($1_LIBS)
 ])
 
-AC_DEFUN([TUXBOX_APPS_LIB_CONFIG],[
+AC_DEFUN([TUXBOX_APPS_LIB_CONFIG], [
 _TUXBOX_APPS_LIB_CONFIG($1,$2,ERROR)
 if test "$$1_CONFIG" = "no"; then
 	AC_MSG_ERROR([could not find $2]);
 fi
 ])
 
-AC_DEFUN([TUXBOX_APPS_LIB_CONFIG_CHECK],[
+AC_DEFUN([TUXBOX_APPS_LIB_CONFIG_CHECK], [
 _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
+AC_DEFUN([TUXBOX_APPS_PKGCONFIG], [
+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
 ])
 
-AC_DEFUN([_TUXBOX_APPS_LIB_PKGCONFIG],[
+AC_DEFUN([_TUXBOX_APPS_LIB_PKGCONFIG], [
 AC_REQUIRE([TUXBOX_APPS_PKGCONFIG])
 AC_MSG_CHECKING(for package $2)
 if $PKG_CONFIG --exists "$2" ; then
@@ -333,249 +396,155 @@ if $PKG_CONFIG --exists "$2" ; then
 else
 	AC_MSG_RESULT(no)
 fi
-
 AC_SUBST($1_CFLAGS)
 AC_SUBST($1_LIBS)
 ])
 
-AC_DEFUN([TUXBOX_APPS_LIB_PKGCONFIG],[
+AC_DEFUN([TUXBOX_APPS_LIB_PKGCONFIG], [
 _TUXBOX_APPS_LIB_PKGCONFIG($1,$2)
 if test x"$$1_EXISTS" != xyes; then
 	AC_MSG_ERROR([could not find package $2]);
 fi
 ])
 
-AC_DEFUN([TUXBOX_APPS_LIB_PKGCONFIG_CHECK],[
+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_DEFUN([TUXBOX_BOXTYPE], [
 AC_ARG_WITH(boxtype,
-	[  --with-boxtype          valid values: dbox2,tripledragon,dreambox,ipbox,coolstream,generic],
+	AS_HELP_STRING([--with-boxtype], [valid values: tripledragon, coolstream, spark, azbox, generic, armbox]),
 	[case "${withval}" in
-		dbox2|dreambox|ipbox|tripledragon|coolstream|generic)
+		tripledragon|coolstream|spark|azbox|generic|armbox)
 			BOXTYPE="$withval"
-			;;
-		dm*)
-			BOXTYPE="dreambox"
-			BOXMODEL="$withval"
-			;;
+		;;
 		*)
-			AC_MSG_ERROR([bad value $withval for --with-boxtype]) ;;
-	esac], [BOXTYPE="coolstream"])
+			AC_MSG_ERROR([bad value $withval for --with-boxtype])
+		;;
+	esac],
+	[BOXTYPE="generic"])
 
 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],
+	AS_HELP_STRING([--with-boxmodel], [valid for coolstream: hd1, hd2])
+AS_HELP_STRING([], [valid for armbox: hd51, hd60, vusolo4k, bre2ze4k])
+AS_HELP_STRING([], [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
+		;;
+		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
+		;;
+		hd51|hd60|vusolo4k|bre2ze4k)
+			if test "$BOXTYPE" = "armbox"; then
 				BOXMODEL="$withval"
 			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])
 			fi
-			;;
+		;;
 		*)
 			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])
 
 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(BOXTYPE_ARMBOX, test "$BOXTYPE" = "armbox")
 
-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_HD51, test "$BOXMODEL" = "hd51")
+AM_CONDITIONAL(BOXMODEL_HD60, test "$BOXMODEL" = "hd60")
+AM_CONDITIONAL(BOXMODEL_VUSOLO4K, test "$BOXMODEL" = "vusolo4k")
+AM_CONDITIONAL(BOXMODEL_BRE2ZE4K, test "$BOXMODEL" = "bre2ze4k")
 
-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")
+AM_CONDITIONAL(BOXMODEL_RASPI, test "$BOXMODEL" = "raspi")
 
-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])
+elif test "$BOXTYPE" = "armbox"; then
+	AC_DEFINE(HAVE_ARM_HARDWARE, 1, [building for an armbox])
 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" = "hd51"; then
+	AC_DEFINE(BOXMODEL_HD51, 1, [hd51])
+	AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION, 1, [enable change the osd resolution])
+elif test "$BOXMODEL" = "hd60"; then
+	AC_DEFINE(BOXMODEL_HD60, 1, [hd60])
+	AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION, 1, [enable change the osd resolution])
+elif test "$BOXMODEL" = "vusolo4k"; then
+	AC_DEFINE(BOXMODEL_VUSOLO4K, 1, [vusolo4k])
+	AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION, 1, [enable change the osd resolution])
+elif test "$BOXMODEL" = "bre2ze4k"; then
+	AC_DEFINE(BOXMODEL_BRE2ZE4K, 1, [bre2ze4k])
+	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
 ])
 
 dnl backward compatiblity
-AC_DEFUN([AC_GNU_SOURCE],
-[AH_VERBATIM([_GNU_SOURCE],
-[/* Enable GNU extensions on systems that have them.  */
+AC_DEFUN([AC_GNU_SOURCE], [
+AH_VERBATIM([_GNU_SOURCE], [
+/* Enable GNU extensions on systems that have them. */
 #ifndef _GNU_SOURCE
 # undef _GNU_SOURCE
-#endif])dnl
+#endif
+])dnl
 AC_BEFORE([$0], [AC_COMPILE_IFELSE])dnl
 AC_BEFORE([$0], [AC_RUN_IFELSE])dnl
 AC_DEFINE([_GNU_SOURCE])
 ])
 
-AC_DEFUN([AC_PROG_EGREP],
-[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep],
-   [if echo a | (grep -E '(a|b)') >/dev/null 2>&1
-    then ac_cv_prog_egrep='grep -E'
-    else ac_cv_prog_egrep='egrep'
-    fi])
- EGREP=$ac_cv_prog_egrep
- AC_SUBST([EGREP])
+AC_DEFUN([AC_PROG_EGREP], [
+AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep], [
+if echo a | (grep -E '(a|b)') >/dev/null 2>&1; then
+	ac_cv_prog_egrep='grep -E'
+else
+	ac_cv_prog_egrep='egrep'
+fi
+])
+EGREP=$ac_cv_prog_egrep
+AC_SUBST([EGREP])
 ])
-

autogen.sh

@@ -12,4 +12,4 @@ aclocal --force
 libtoolize --force
 autoconf --force
 autoheader  --force
-automake --add-missing --force-missing --foreign
+automake --add-missing --force-missing

configure.ac

@@ -1,9 +1,21 @@
-AC_INIT(tuxbox-neutrino,1.0.1)
-AM_INIT_AUTOMAKE([1.0.1 nostdinc])
+# explicit defines for separate revision handling
+define(ver_major, 3)
+define(ver_minor, 9)
+define(ver_micro, 0)
+define(neutrino_rel_cycle, ver_major.ver_minor)
+
+AC_INIT(Tuxbox-Neutrino,ver_major.ver_minor.ver_micro)
+AM_INIT_AUTOMAKE([nostdinc foreign])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
 
+AC_DEFINE(RELEASE_CYCLE, "2.5", [Release cycle information; used in update code; only relevant for flash image releases ])
+
+AC_DEFINE(PACKAGE_VERSION_MAJOR, ver_major, [Major version number])
+AC_DEFINE(PACKAGE_VERSION_MINOR, ver_minor, [Minor version number])
+AC_DEFINE(PACKAGE_VERSION_MICRO, ver_micro, [Micro version number])
+AC_DEFINE(PACKAGE_VERSION_NEUTRINO_REL_CYCLE, neutrino_rel_cycle, [Neutrino release cycle])
+
 TUXBOX_APPS
-TUXBOX_APPS_DVB
 TUXBOX_APPS_DIRECTORY
 TUXBOX_APPS_PKGCONFIG
 TUXBOX_BOXTYPE
@@ -13,39 +25,43 @@ 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,
-	AS_HELP_STRING(--enable-ffmpegdec,include ffmpeg decoder support),
-	,[enable_ffmpegdec=no])
+	AS_HELP_STRING([--enable-ffmpegdec], [enable ffmpeg decoder support @<:@default=no@:>@]),
+	AC_DEFINE(ENABLE_FFMPEGDEC, 1, [include ffmpeg decoder support]))
+AM_CONDITIONAL(ENABLE_FFMPEGDEC, test "$enable_ffmpegdec" = "yes")
 
-AM_CONDITIONAL(ENABLE_FFMPEGDEC,test "$enable_ffmpegdec" = "yes")
-if test "$enable_ffmpegdec" = "yes"; then
-	AC_DEFINE(ENABLE_FFMPEGDEC,1,[include ffmpeg decoder support])
-fi
+if test "$enable_ffmpegdec" != "yes"; then
 
-if test x"$enable_ffmpegdec" != xyes; then
-
-AC_ARG_WITH([tremor], [AS_HELP_STRING([--with-tremor],
-	[use libvorbisidec instead of libogg/libvorbis])],
+AC_ARG_WITH(tremor,
+	AS_HELP_STRING([--with-tremor], [use libvorbisidec instead of libogg/libvorbis @<:@default=no@:>@]),
 	[TREMOR="$withval"],
 	[TREMOR=no])
 
-AC_ARG_WITH([tremor-static], [AS_HELP_STRING([--with-tremor-static],
-	[use statically linked libvorbisidec instead of libogg/libvorbis])],
+AC_ARG_WITH(tremor-static,
+	AS_HELP_STRING([--with-tremor-static], [use statically linked libvorbisidec instead of libogg/libvorbis @<:@default=no@:>@]),
 	[TREMOR_STATIC="$withval"],
 	[TREMOR_STATIC=no])
 
@@ -55,7 +71,7 @@ fi
 
 if test "$TREMOR" = "yes"; then
 	TUXBOX_APPS_LIB_PKGCONFIG(VORBISIDEC,vorbisidec)
-	AC_DEFINE(USE_TREMOR,1,use libvorbisidec/tremor library)
+	AC_DEFINE(USE_TREMOR, 1, use libvorbisidec/tremor library)
 fi
 
 if test "$TREMOR_STATIC" = "yes"; then
@@ -77,161 +93,218 @@ TUXBOX_APPS_LIB_PKGCONFIG_CHECK(OGG,ogg)
 if test -z "$OGG_CFLAGS" ; then
 	TUXBOX_APPS_LIB_PKGCONFIG(OGG,ogg)
 fi
+
+fi # test "$enable_ffmpegdec"
+
 TUXBOX_APPS_LIB_PKGCONFIG(SWRESAMPLE,libswresample)
-else
-TUXBOX_APPS_LIB_PKGCONFIG(SWRESAMPLE,libswresample)
-fi
+
+AM_CONDITIONAL(USE_TREMOR, test "$TREMOR" = "yes")
 
 if test "$BOXTYPE" = "tripledragon"; then
 	TUXBOX_APPS_LIB_PKGCONFIG(DIRECTFB, directfb)
 fi
 
-AM_CONDITIONAL(USE_TREMOR, test "$TREMOR" = "yes")
-
 # TUXBOX_APPS_LIB_PKGCONFIG(OPENSSL,openssl)
 TUXBOX_APPS_LIB_PKGCONFIG(CURL,libcurl)
-TUXBOX_APPS_LIB_PKGCONFIG(FREETYPE,freetype2)
+
+## 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"
+], [
+	echo "freetype2 >= 2.5.0 not found, use alternative search method with freetype-config"
+	#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)
 TUXBOX_APPS_LIB_PKGCONFIG(SIGC,sigc++-2.0)
 
-#TUXBOX_APPS_LIB_PKGCONFIG(CONFIGFILE,tuxbox-configfile)
-#TUXBOX_APPS_LIB_PKGCONFIG(CONNECTION,tuxbox-connection)
-#TUXBOX_APPS_LIB_PKGCONFIG(EVENTSERVER,tuxbox-eventserver)
-#TUXBOX_APPS_LIB_PKGCONFIG(LCDDISPLAY,tuxbox-lcddisplay)
-#TUXBOX_APPS_LIB_PKGCONFIG(LIRCDCLIENT,tuxbox-lircdclient)
-#TUXBOX_APPS_LIB_PKGCONFIG(NET,tuxbox-net)
-#TUXBOX_APPS_LIB_PKGCONFIG(PLUGINS,tuxbox-plugins)
-#TUXBOX_APPS_LIB_PKGCONFIG(TUXBOX,tuxbox)
-#TUXBOX_APPS_LIB_PKGCONFIG(UCODES,tuxbox-ucodes)
-#TUXBOX_APPS_LIB_PKGCONFIG(MPEGTOOLS,tuxbox-mpegtools)
-#TUXBOX_APPS_LIB_PKGCONFIG(TUXTXT,tuxbox-tuxtxt)
-
-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])])
-
-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(giflib,
-	AS_HELP_STRING(--enable-giflib,use giflib instead of libungif),
-	,[enable_giflib=no])
-
-AM_CONDITIONAL(ENABLE_GIFLIB,test "$enable_giflib" = "yes")
-if test "$enable_giflib" = "yes"; then
-	AC_DEFINE(ENABLE_GIFLIB,1,[use giflib instead of libungif])
+if test "$BOXTYPE" = "armbox"; then
+	TUXBOX_APPS_LIB_PKGCONFIG(SWSCALE,libswscale)
 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),
-	,[enable_flac=no])
-
-AM_CONDITIONAL(ENABLE_FLAC,test "$enable_flac" = "yes")
-if test "$enable_flac" = "yes"; then
-	AC_DEFINE(ENABLE_FLAC,1,[include FLAC support])
-fi
-
-# UPNP - upnp browser (borken right now)
-AC_ARG_ENABLE(upnp,
-	AS_HELP_STRING(--disable-upnp,disable UPNP support),
-	,[enable_upnp=yes])
-
-AM_CONDITIONAL(ENABLE_UPNP,test "$enable_upnp" = "yes")
-if test "$enable_upnp" = "yes"; then
-	AC_DEFINE(ENABLE_UPNP,1,[include UPNP support - currently broken])
-fi
-
-# Lua - embeddable scripting language
-AC_ARG_ENABLE(lua,
-	AS_HELP_STRING(--enable-lua,include Lua support),
-	,[enable_lua=no])
-
-AM_CONDITIONAL(ENABLE_LUA,test "$enable_lua" = "yes")
-if test "$enable_lua" = "yes"; then
-	AC_DEFINE(ENABLE_LUA,1,[include Lua support])
-	PKG_CHECK_MODULES([LUA], [lua >= 5.2], echo "lua >= 5.2 found", [
-		PKG_CHECK_MODULES([LUA], [lua5.2 >= 5.2], echo "lua5.2 found", [
-			echo "=> lualib not found, assuming static lua in linker path..."
-			LUA_LIBS="-llua -ldl"
-			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,
-	[  --enable-cleanup                  enable cleanup on exit],
-	[AC_DEFINE(EXIT_CLEANUP,1,[enable cleanup on exit])])
-
-AC_ARG_ENABLE(pip,
-	[  --enable-pip                  enable picture in picture support],
-	[AC_DEFINE(ENABLE_PIP,1,[enable picture in picture support])])
-
-
-AC_ARG_ENABLE(testing,
-       AS_HELP_STRING(--enable-testing,include devel code parts for neutrino tests))
-
-AM_CONDITIONAL(ENABLE_TESTING,test "$enable_testing" = "yes")
-if test "$enable_testing" = "yes"; then
-	AC_DEFINE(ENABLE_TESTING,1,[include devel code parts for neutrino tests - not recommended for general users!])
-fi
-
-
 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.])
+	TUXBOX_APPS_LIB_PKGCONFIG(BLURAY,libbluray)
 fi
-HWLIB_CFLAGS='-I$(top_srcdir)/lib/libcoolstream'
 
-if test "$BOXMODEL" = "apollo"; then
-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.])
+if test "$BOXTYPE" = "coolstream" ||
+   test "$BOXTYPE" = "armbox" ||
+   test "$BOXTYPE" = "generic" ||
+   test "$BOXTYPE" = "tripledragon" ||
+   test "$BOXTYPE" = "spark"; then
+	AC_DEFINE(SCREENSHOT, 1, [Define to 1 if the platform supports screenshots])
 fi
-if test -e ${srcdir}/lib/libcoolstream2/cs_frontpanel.h; then
-	AC_DEFINE(HAVE_COOLSTREAM_CS_FRONTPANEL_H,1,[Define to 1 if you have the <cs_frontpanel.h> header file.])
+
+AC_ARG_ENABLE(lcd4linux,
+	AS_HELP_STRING([--enable-lcd4linux], [enable Lcd4Linux support]),
+	,[enable_lcd4linux=no])
+AM_CONDITIONAL(ENABLE_LCD4LINUX, test "$enable_lcd4linux" = "yes")
+if test "$enable_lcd4linux" = "yes"; then
+	AC_DEFINE(ENABLE_LCD4LINUX, 1, [include Lcd4Linux support])
 fi
-HWLIB_CFLAGS='-I$(top_srcdir)/lib/libcoolstream2'
+
+AC_ARG_ENABLE(keyboard-no-rc,
+	AS_HELP_STRING([--enable-keyboard-no-rc], [enable keyboard control, disable rc control @<:@default=no@:>@]),
+	AC_DEFINE(KEYBOARD_INSTEAD_OF_REMOTE_CONTROL, 1, [enable keyboard control, disable rc control]))
+
+AC_ARG_ENABLE(mdev,
+	AS_HELP_STRING([--enable-mdev], [use mdev instead of broken neutrino mount hack @<:@default=no@:>@]),
+	AC_DEFINE(ASSUME_MDEV, 1, [use mdev instead of broken neutrino mount hack]))
+
+AC_ARG_ENABLE(freesatepg,
+	AS_HELP_STRING([--enable-freesatepg], [enable Freesat EPG code @<:@default=no@:>@]),
+	AC_DEFINE(ENABLE_FREESATEPG, 1, [enable Freesat EPG code]))
+
+AC_ARG_ENABLE(viasatepg,
+	AS_HELP_STRING([--enable-viasatepg], [enable ViaSat EPG code @<:@default=no@:>@]),
+	AC_DEFINE(ENABLE_VIASATEPG, 1, [enable ViaSat EPG code]))
+
+AC_ARG_ENABLE(fastscan,
+	AS_HELP_STRING([--enable-fastscan], [enable fastscan code @<:@default=no@:>@]),
+	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 @<:@default=no@:>@]),
+	AC_DEFINE(ENABLE_GIFLIB, 1, [use giflib instead of libungif]))
+AM_CONDITIONAL(ENABLE_GIFLIB, test "$enable_giflib" = "yes")
+
+AC_ARG_ENABLE(pugixml,
+	AS_HELP_STRING([--enable-pugixml], [use pugixml instead of xmltree @<:@default=no@:>@]),
+	AC_DEFINE(USE_PUGIXML, 1, [use pugixml instead of xmltree]))
+AM_CONDITIONAL(USE_PUGIXML, test "$enable_pugixml" = "yes")
+
+AC_ARG_ENABLE(flac,
+	AS_HELP_STRING([--enable-flac], [enable FLAC support @<:@default=no@:>@]),
+	AC_DEFINE(ENABLE_FLAC, 1, [enable FLAC support]))
+AM_CONDITIONAL(ENABLE_FLAC, test "$enable_flac" = "yes")
+
+AC_ARG_ENABLE(upnp,
+	AS_HELP_STRING([--enable-upnp], [enable UPNP support @<:@default=yes@:>@]),
+	[enable_upnp="$enableval"],
+	[enable_upnp="yes"])
+
+if test "$enable_upnp" = "yes"; then
+	AC_DEFINE(ENABLE_UPNP, 1, [enable UPNP support])
 fi
+AM_CONDITIONAL(ENABLE_UPNP, test "$enable_upnp" = "yes")
+
+AC_ARG_ENABLE(extupdate,
+	AS_HELP_STRING([--enable-extupdate], [enable extended update routine @<:@default=no@:>@]),
+	AC_DEFINE(ENABLE_EXTUPDATE, 1, [enable extended update routine]))
+AM_CONDITIONAL(ENABLE_EXTUPDATE, test "$enable_extupdate" = "yes")
+
+AC_ARG_ENABLE(lua,
+	AS_HELP_STRING([--enable-lua], [enable Lua support @<:@default=yes@:>@]),
+	[enable_lua="$enableval"],
+	[enable_lua="yes"])
+
+if test "$enable_lua" = "yes"; then
+	AC_DEFINE(ENABLE_LUA, 1, [include Lua support])
+	PKG_CHECK_MODULES([LUA], [lua >= 5.2], [
+		echo "lua >= 5.2 found"
+	], [
+		PKG_CHECK_MODULES([LUA], [lua5.2 >= 5.2], [
+			echo "lua5.2 found"
+		], [
+			echo "lualib not found, assuming static lua in linker path..."
+			LUA_LIBS="-llua -ldl"
+			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
+AM_CONDITIONAL(ENABLE_LUA, test "$enable_lua" = "yes")
+
+AC_ARG_ENABLE(cleanup,
+	AS_HELP_STRING([--enable-cleanup], [enable cleanup on exit @<:@default=no@:>@]),
+	AC_DEFINE(EXIT_CLEANUP, 1, [enable cleanup on exit]))
+
+AC_ARG_ENABLE(pip,
+	AS_HELP_STRING([--enable-pip], [enable picture in picture support @<:@default=no@:>@]),
+	AC_DEFINE(ENABLE_PIP, 1, [enable picture in picture support]))
+
+AC_ARG_ENABLE(testing,
+	AS_HELP_STRING([--enable-testing], [enable development code @<:@default=no@:>@]),
+	AC_DEFINE(ENABLE_TESTING, 1, [enable development code]))
+AM_CONDITIONAL(ENABLE_TESTING, test "$enable_testing" = "yes")
+
+AC_ARG_ENABLE(fribidi,
+	AS_HELP_STRING([--enable-fribidi], [enable fribidi support @<:@default=no@:>@]),
+	AC_DEFINE(ENABLE_FRIBIDI, 1, [enable fribidi support]))
+AM_CONDITIONAL(ENABLE_FRIBIDI, test "$enable_fribidi" = "yes")
+
+AC_ARG_WITH(stb-hal-includes,
+	AS_HELP_STRING([--with-stb-hal-includes=PATH], [path for libstb-hal includes [[NONE]]]),
+	[STB_HAL_INC="$withval"],
+	[STB_HAL_INC=""])
+AC_CHECK_HEADER([$STB_HAL_INC/libstb-hal-config.h], [AC_DEFINE(HAVE_CONFIG_HAL_H, 1 , [availability of libstb-hal-config.h as external header from libstb_hal, usable e.g. for package informations])])
+
+AC_ARG_WITH(stb-hal-build,
+	AS_HELP_STRING([--with-stb-hal-build=PATH], [path where libstb-hal is built [[NONE]]]),
+	[STB_HAL_LIB="-L$withval"],
+	[STB_HAL_LIB=""])
+
+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
+AM_CONDITIONAL(USE_STB_HAL, test "$BOXTYPE" != "coolstream")
+
+if test "$BOXTYPE" = "coolstream"; then
+	if test "$BOXMODEL" = "hd1"; 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'
+	fi
+
+	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/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
+
+# 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
@@ -247,70 +320,104 @@ 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
+data/Makefile
+data/config/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/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/policy/Makefile
+data/scripts/Makefile
+data/themes/Makefile
+data/themes/Grey-Blue/Makefile
+data/themes/Grey-Blue/icons/Makefile
+data/themes/Grey-Blue/icons/buttons/Makefile
+data/themes/Neutrino-3.0/Makefile
+data/themes/Neutrino-3.0/icons/Makefile
+data/themes/Neutrino-3.0/icons/buttons/Makefile
+data/themes/Olive-3.0/Makefile
+data/themes/Olive-3.0/icons/Makefile
+data/themes/Olive-3.0/icons/buttons/Makefile
+data/webradio/Makefile
+data/webtv/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
+data/zapit/Makefile
 lib/Makefile
-lib/libconfigfile/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/xmltree/Makefile
-lib/jsoncpp/Makefile
+lib/libtuxtxt/Makefile
+lib/libupnpclient/Makefile
+lib/luaclient/Makefile
 lib/sectionsdclient/Makefile
 lib/timerdclient/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/yhttpd_core/Makefile
-src/nhttpd/yhttpd_mods/Makefile
-src/nhttpd/nhttpd.conf
+lib/xmltree/Makefile
 src/Makefile
 src/daemonc/Makefile
-src/driver/pictureviewer/Makefile
-src/driver/audiodec/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/gui/widget/yaft/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
-data/Makefile
-data/fonts/Makefile
-data/icons/Makefile
-data/inetradio/Makefile
-data/initial/Makefile
-data/iso-codes/Makefile
-data/lcd/Makefile
-data/lcd/icons/Makefile
-data/lcd/clock/Makefile
-data/license/Makefile
-data/locale/Makefile
-data/neutrino-scripts/Makefile
-data/scripts/Makefile
-data/themes/Makefile
-src/eitd/Makefile
 src/timerd/Makefile
 src/zapit/Makefile
 src/zapit/lib/Makefile
 src/zapit/src/Makefile
-src/zapit/data/Makefile
 ])

data/Makefile.am

@@ -1,11 +1,22 @@
-SUBDIRS = fonts icons inetradio initial iso-codes license locale scripts themes neutrino-scripts
+SUBDIRS = \
+	config \
+	fonts \
+	icons \
+	inetradio \
+	initial \
+	iso-codes \
+	license \
+	locale \
+	neutrino-scripts \
+	pictures \
+	policy \
+	scripts \
+	themes \
+	webradio \
+	webtv \
+	y-web \
+	zapit
 
 if BOXTYPE_TRIPLE
 SUBDIRS += lcd
 endif
-
-configdir = $(CONFIGDIR)
-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

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

data/config/Makefile.am

@@ -0,0 +1,12 @@
+installdir = $(CONFIGDIR)
+
+install_DATA = \
+	bad_package_pattern.list.sample \
+	cables.xml \
+	encoding.conf \
+	epglanguages.conf \
+	providermap.xml \
+	satellites.xml \
+	settingsupdate.conf \
+	terrestrial.xml \
+	tobackup.conf

data/config/bad_package_pattern.list.sample

@@ -0,0 +1,95 @@
+^locale-base-
+^perl-module-
+acl-
+attr-
+autofs-
+base-passwd-
+bash-
+busybox-
+-charmap-
+db-
+-dbg$
+-dev$
+-doc$
+e2fsprogs-
+fbset-
+fftwf-
+fftwl-
+firmware-
+flex-
+-gconv-
+gettext-
+git-
+gitweb
+glibc-
+initscripts-
+kbd-
+kernel-
+kmod-
+krb5-
+libaio-
+libao-
+libasn-
+libavahi-
+libbluray-
+libc6-
+libcairo-
+libcli-
+libdbus-
+libdcerpc-
+libdrm-
+liberation-fonts
+libexpat-
+libfftwf
+libfif-
+libfribidi-
+libgdbm-
+libgdk-
+libglib-
+libgnutls-
+libharfbuzz-
+libinput-
+libldap-
+libndr-
+libnl-
+libnss-
+libsal2-
+libsmb$
+libstb-
+libtiff-
+libx264-
+libxml2-
+libxslt-
+-locale-
+-localedata-
+lua-
+mc-
+mtd-utils-
+ncurses-
+nfs-utils-
+ntfs-3g-
+ntp-
+openssh-
+openssl-
+opkg-
+pam-
+pcsc-lite-
+perl-
+-ptest$
+python-
+python3-
+samba-
+-samba4
+shadow-
+shared-mime-info-
+-staticdev$
+systemd-
+tzdata-
+udev-
+usbutils-
+util-linux-
+wayland-
+webmin-
+weston-
+wpa-supplicant-
+zsh-

data/config/cables.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <cables>
-	<cable name="KMS Muenchen" satfeed="true" flags="9">
+	<cable name="KMS München" satfeed="true" flags="9">
 		<transponder frequency="113000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
 		<transponder frequency="121000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="130000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
@@ -79,7 +79,7 @@
 		<transponder frequency="706000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="714000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 	</cable>
-	<cable name="KMS Nuernberg" satfeed="true" flags="9">
+	<cable name="KMS Nürnberg" satfeed="true" flags="9">
 		<transponder frequency="113000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
 		<transponder frequency="121000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
 		<transponder frequency="322000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
@@ -228,6 +228,27 @@
 		<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="178000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="186000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="194000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="202000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="210000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<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="5"/>
+		<transponder frequency="290000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<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="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="5"/>
 		<transponder frequency="354000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="362000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
@@ -243,74 +264,7 @@
 		<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"/>
-		<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="522000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="530000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="538000" 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="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="Primacom Sat Einspeisung" satfeed="true" flags="9">
 		<transponder frequency="113000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
@@ -442,10 +396,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"/>
@@ -456,15 +410,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"/>
@@ -473,8 +433,15 @@
 		<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">
+	<cable name="Göltzschtalbrücke" satfeed="true" flags="9">
+		<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"/>
@@ -527,6 +494,7 @@
 		<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"/>
+		<transponder frequency="650000" 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"/>
@@ -555,7 +523,7 @@
 		<transponder frequency="538000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="546000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 	</cable>
-	<cable name="Antennenverein Hohenmoelsen" satfeed="true" flags="9">
+	<cable name="Antennenverein Hohenmölsen" 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="3"/>
 		<transponder frequency="130000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
@@ -1420,14 +1388,74 @@
 		<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="530000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="538000" 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="578000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="586000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="610000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
 		<transponder frequency="618000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="626000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="642000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="650000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="658000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<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="OstTelCom GmbH" satfeed="true" flags="9">
+		<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="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="5"/>
+		<transponder frequency="354000" 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="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="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="530000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="538000" 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="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="6900000" fec_inner="0" modulation="5"/>
+		<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"/>
+		<transponder frequency="658000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="666000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="674000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<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="714000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 	</cable>
 	<cable name="CST Berlin" satfeed="true" flags="9">
 		<transponder frequency="306000" symbol_rate="6900000" fec_inner="0" modulation="5"/>

data/config/epglanguages.conf

@@ -0,0 +1,6 @@
+FIRST_ALL
+deu
+ger
+eng
+fra
+fre

data/config/epgmap.xml

@@ -16,4 +16,7 @@
 	<filter channel_id="b12003ee00011078" new_epg_id="ac423070013e2144"/> --rainews24
 
 	<filter channel_id="b4d6070800c80e26" new_epg_id="b45803fb0001283d"/> --Das Erste
+
+	<filter channel_id="aa0004210001ef10" >RTL.de</filter> --RTL HD
+	<filter channel_id="b6ba3db8013e4224" >RedlightHD.ero</filter> --Redlight HD
 </zapit>

data/fonts/Makefile.am

@@ -1,16 +1,33 @@
 installdir = $(FONTDIR)
 
+# NOTE:
+#	pakenham.ttf is not used by neutrino.
+#	It's the default- respectively fallback-font for some classic plugins.
+#
+#	tuxtxt.otb is the non-ttf font for tuxtxt (UseTTF 0 in tuxtxt2.conf).
+#	Variables neutrino_ttf and tuxtxt_ttf describe aliases for neutrino.ttf and tuxtxt.ttf.
+
+neutrino_ttf = neutrino.ttf
+tuxtxt_ttf = DejaVuLGCSansMono-Bold.ttf
+
 install_DATA = \
+	$(neutrino_ttf) \
+	$(tuxtxt_ttf) \
+	LiberationSans-Regular.ttf \
 	md_khmurabi_10.ttf \
 	micron_bold.ttf \
 	micron_italic.ttf \
 	micron.ttf \
-	neutrino.ttf \
 	pakenham.ttf \
-	DejaVuLGCSansMono-Bold.ttf \
-	tuxtxt.ttf \
 	tuxtxt.otb
 
-if BOXMODEL_APOLLO
+
+if BOXMODEL_CS_HD2
 install_DATA += UnDotum.ttf
 endif
+
+install-data-hook:
+	cd $(DESTDIR)$(FONTDIR); \
+		mv $(neutrino_ttf) neutrino.ttf; \
+		mv $(tuxtxt_ttf) tuxtxt.ttf; \
+		ln -sf tuxtxt.ttf shell.ttf

data/fonts/liberation_sans/AUTHORS

@@ -0,0 +1,10 @@
+Font Designer:
+  Ascender Corporation.
+  http://www.ascendercorp.com/
+
+Original Designer:
+  Steve Matteson
+  http://www.ascendercorp.com/typedesigners.html
+
+Current Maintainer:
+  Caius Chance <cchance@redhat.com>

data/fonts/liberation_sans/COPYING

@@ -0,0 +1,340 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year  name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.

data/fonts/liberation_sans/ChangeLog

@@ -0,0 +1,151 @@
+* Mon 12 Jan 2009 Caius Chance <cchance@redhat.com>
+- Fixed copyright holder name typo for Sans Regular font (rhbz#479521).
+
+* Tue 09 Dec 2008 Caius Chance <cchance@redhat.com>
+- Changed cent sign glyph (U+00A2) to be coressed in Sans and Mono
+  (rhbz#474522).
+
+* Wed 03 Dec 2008 Caius Chance <cchance@redhat.com>
+- Started 1.04.93.devel.
+- Fixed blurriness of U+03BC for Sans Regular font (rhbz#473481).
+- Fixed src tarball mis-inclusion of dist files in Makefile.
+
+* Fri 28 Nov 2008 Caius Chance <cchance@redhat.com>
+- Corrected version number in Makefile.
+- Fixed make target of source tarball.
+- Uploaded 1.04.92 source tarball to release area.
+
+* Wed 15 Oct 2008 Caius Chance <cchance@redhat.com>
+- Fixed blurred 'u' and 'W' for Sans Bold font (rhbz#463036).
+- Released as version 1.04.92
+
+* Wed 17 Sep 2008 Caius Chance <cchance@redhat.com>
+- Fixed missing hinting instructions for all Mono fonts (rhbz#460090).
+- Fixed missing hinting instructions for all Sans fonts (rhbz#460090).
+- Fixed missing hinting instructions for all Serif fonts (rhbz#460090).
+- Released as version 1.04.91
+
+* Tue 09 Sep 2008 Caius Chance <cchance@redhat.com>
+- Backed up all released files in ./dist directory.
+
+* Fri 05 Sep 2008 Caius Chance <cchance@redhat.com>
+- Fixed incorrect glyph points and missing hinting instructions for:
+  Mono Bold Italic (up to U+2012) (rhbz#460090).
+
+* Mon 25 Aug 2008 Caius Chance <cchance@redhat.com>
+- Fixed incorrect glyph points and missing hinting instructions for:
+  U+0079, U+03BC, U+0431, U+2010..2012, U+1114117 (rhbz#458592).
+- Released as version 1.04.90.
+
+* Thu 13 Jul 2008 Caius Chance <cchance@redhat.com>
+- Released as version 1.04.
+
+* Thu 12 Jun 2008 Caius Chance <cchance@redhat.com>
+- Released as version 1.04.beta2 (1.03.99).
+- Added ZIP package building for non-tar users.
+- rhbz#440992:
+  - Created Romanian "T/t/S/s with comma below" (U+0218..021B) on all fonts.
+  - Fixed "T/s with cedilla below" (U+0162/0163) on all fonts.
+  - Created "Hyphen" and "Non-Breaking Hyphen" (U+2010..2011) on all fonts.
+
+* Wed 11 Jun 2008 Caius Chance <cchance@redhat.com>
+- Added last Version 1.03 from original manufacturer.
+- Renamed directory 'archive' to 'sandbox'.
+- Added directory description in hosting home directory.
+- Created ZIP packages for Version 1.03 and 1.04.beta.
+
+* Tue 04 Jun 2008 Caius Chance <cchance@redhat.com>
+- rhbz#440992:
+  - Created "Hyphen" and "Non-Breaking Hyphen" (U+2010..2011) on Sans Regular.
+
+* Mon 03 Jun 2008 Caius Chance <cchance@redhat.com>
+- rhbz#440992:
+  - Created Romanian "T/t/S/s with comma below" (U+0218..021B) on Sans Regular.
+  - Fixed "T/s with cedilla below" (U+0162/0163) on Sans Regular.
+
+* Fri 30 May 2008 Caius Chance <cchance@redhat.com>
+- Release Version 1.04.beta (liberation-fonts-1_04_beta).
+
+* Thu 29 May 2008 Caius Chance <cchance@redhat.com>
+- Correct SFD version numbers in "TTF Info" categor for correct version
+  number during export to TTFs.
+
+* Wed 28 May 2008 Caius Chance <cchance@redhat.com>
+- Reencoded with "Glyph Order" by FontForge.
+- Corrected font name for all Regular fonts.
+- Generated TTFs (experimantal, in "archive") with old stle kern and dummy
+  DSIG table.
+- Updated README in 1.04b TTFs (experimental, in "archive").
+
+* Tue 27 May 2008 Caius Chance <cchance@redhat.com>
+- Fixed Unicode name mis-mapping of Sans and Serif TTF files.
+- Regenerate SFD files from Unicode name mis-mapping fixed Sans and Serif TTF
+  files.
+
+* Mon 26 May 2008 Caius Chance <cchance@redhat.com>
+- Fixed Unicode name mis-mapping of Mono TTF files.
+- Regenerate SFD files from Unicode name mis-mapping fixed Mono TTF files.
+==========
+- Applied following patches submitted by Nicolas Spalinger
+  <nicolas_spalinger sil org>:
+  - We-need-versioned-tarballs.
+  - Add-ignore-file-so-the-VCS-does-not-track-the-folder.
+  - Adjust-path-for-various-Makefile-targets-subfolders.
+  - Fix-versionning-mismatch-in-the-binary-font-metadata.
+  - Add-some-description-and-extra-lines-to-the-build-ta.
+  - Reword-and-restructure-maintainers-recommendations.
+  - Some-rewording-of-the-readme-file.
+==========
+
+* Thu May 22 2008 Caius Chance <cchance@redhat.com>
+- Added latest (1.03) TTF files from Ascender. (in 'archive')
+
+* Fri May 16 2008 Caius Chance <cchance@redhat.com>
+- Change source tree as 'trunk', 'tags', 'branches'.
+==========
+- Applied following patches submitted by Nicolas Spalinger
+  <nicolas_spalinger sil org>:
+  - Add-more-information-about-the-upstream-designer.
+  - Minor-typo-and-layout-fixes.
+  - Adjust-fontforge-path-with-env-as-a-source-build.
+==========
+
+* Wed May 14 2008 Caius Chance <cchance@redhat.com>
+- Renamed target 'ttf' to 'build'.
+- Removed 'Re-Package' chapter from README and refine contents.
+- Changed AUTHORS contents.
+- Created maintainer documentation MAINTAINER.
+
+* Tue May 06 2008 Caius Chance <cchance@redhat.com>
+- Refined clean target.
+- Removed TTFs from git.
+
+* Fri May 02 2008 Caius Chance <cchance@redhat.com>
+- Imported into fedorahosted.org repository and be hosted.
+    https://fedorahosted.org/liberation-fonts/
+- Modified source root directory name definition in Makefile.
+- Created 'dist' target for binary TTF tarball and 'src' for source tarball.
+- Corrected Regular fonts filenames.
+- Added TTF -> SFD make target.
+
+* Thu May 01 2008 Caius Chance <cchance@redhat.com>
+- Converted previous TTF files into SFD files to be open source.
+- Created fontforge SFD -> TTF scripts.
+- Created Makefile.
+- Added documentations: AUTHORS, ChangeLog, README.
+
+* Thu Apr 10 2008 Caius Chance <cchance@redhat.com>
+- Fixed exchanged and incomplete glyphs (from Ascender).
+- Repacked source tarball.
+- Released version 1.03.
+
+* Tue Mar 25 2008 Caius Chance <cchance@redhat.com>
+- Fixed alignment mismatch of dot accents (from Ascender).
+- Released version 1.02.
+
+* Mon Jan 14 2008 Caius Chance <cchance@redhat.com>
+- Updated new source tarball from Ascender.
+- Released version 1.0.
+
+* Thu Jun 14 2007 Caius Chance <cchance@redhat.com>
+- Updated new source tarball from Ascender.

data/fonts/liberation_sans/License.txt

@@ -0,0 +1,19 @@
+LICENSE AGREEMENT AND LIMITED PRODUCT WARRANTY
+LIBERATION FONT SOFTWARE
+
+This agreement governs the use of the Software and any updates to the Software, regardless of the delivery mechanism. Subject to the following terms, Red Hat, Inc. ("Red Hat") grants to the user ("Client") a license to this work pursuant to the GNU General Public License v.2 with the exceptions set forth below and such other terms as are set forth in this End User License Agreement.
+
+ 1. The Software and License Exception. LIBERATION font software  (the "Software") consists of TrueType-OpenType formatted font software for rendering LIBERATION typefaces in sans-serif, serif, and monospaced character styles. You are licensed to use, modify, copy, and distribute the Software pursuant to the GNU General Public License v.2 with the following exceptions:
+
+  (a) As a special exception, if you create a document which uses this font, and embed this font or unaltered portions of this font into the document, this font does not by itself cause the resulting document to be covered by the GNU General Public License. This exception does not however invalidate any other reasons why the document might be covered by the GNU General Public License. If you modify this font, you may extend this exception to your version of the font, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version.
+
+  (b) As a further exception, any distribution of the object code of the Software in a physical product must provide you the right to access and modify the source code for the Software and to reinstall that modified version of the Software in object code form on the same physical product on which you received it.
+
+ 2. Intellectual Property Rights. The Software and each of its components, including the source code, documentation, appearance, structure and organization are owned by Red Hat and others and are protected under copyright and other laws. Title to the Software and any component, or to any copy, modification, or merged portion shall remain with the aforementioned, subject to the applicable license. The "LIBERATION" trademark is a trademark of Red Hat, Inc. in the U.S. and other countries. This agreement does not permit Client to distribute modified versions of the Software using Red Hat's trademarks. If Client makes a redistribution of a modified version of the Software, then Client must modify the files names to remove any reference to the Red Hat trademarks and must not use the Red Hat trademarks in any way to reference or promote the modified Software.
+
+ 3. Limited Warranty. To the maximum extent permitted under applicable law, the Software is provided and licensed "as is" without warranty of any kind, expressed or implied, including the implied warranties of merchantability, non-infringement or fitness for a particular purpose. Red Hat does not warrant that the functions contained in the Software will meet Client's requirements or that the operation of the Software will be entirely error free or appear precisely as described in the accompanying documentation.
+
+ 4. Limitation of Remedies and Liability. To the maximum extent permitted by applicable law, Red Hat or any Red Hat authorized dealer will not be liable to Client for any incidental or consequential damages, including lost profits or lost savings arising out of the use or inability to use the Software, even if Red Hat or such dealer has been advised of the possibility of such damages.
+
+ 5. General. If any provision of this agreement is held to be unenforceable, that shall not affect the enforceability of the remaining provisions. This agreement shall be governed by the laws of the State of North Carolina and of the United States, without regard to any conflict of laws provisions, except that the United Nations Convention on the International Sale of Goods shall not apply.
+Copyright © 2007 Red Hat, Inc. All rights reserved. LIBERATION is a trademark of Red Hat, Inc.

data/fonts/liberation_sans/README

@@ -0,0 +1,68 @@
+1. What's this?
+===============
+
+The Liberation Fonts are intended to be open font replacements for the three
+most commonly used fonts on Microsoft systems: Times New Roman, Arial, and
+Courier New.
+
+
+2. Requirements
+===============
+
+  * fontforge.
+    - http://fontforge.sourceforge.net
+
+
+3. Install
+==========
+
+3.1 Decompress tarball
+
+  You can extract the files by following command:
+
+    $ tar zxvf liberation-fonts-[VERSION].tar.gz
+
+3.2 Build from the source
+
+  Change into directory liberation-fonts-[VERSION]/ and build from sources by
+  following commands:
+
+    $ cd liberation-fonts-[VERSION]
+    $ make
+
+  The built font files will be available in 'build' directory.
+
+3.3 Install to system
+
+  You can manually install the fonts by copying them to ~/.fonts for a
+  particular user, or to /usr/share/fonts/truetype/liberation for system-wide
+  availability
+
+
+4. Usage
+========
+
+The fonts should be installed and detected by the system after installation.
+
+
+5. License
+==========
+
+Read the GPL v2 file 'COPYING' and the Liberation Fonts EULA file 'License.txt'
+for more information.
+
+6. Credits
+==========
+
+Special thanks to all liberation-fonts developers and users!
+
+ * Caius Chance <cchance at redhat.com>
+   - Current project maintainer.
+
+ * Mark Webbink <mwebbink at redhat.com>
+   - Coordinator.
+
+ * Steve Matteson
+   - Ascender Corporation <http://www.ascendercorp.com>
+
+ * And, all other contributors.

data/icons/Makefile.am

@@ -1,279 +1,14 @@
-installdir = $(ICONSDIR)
-
-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_adzap.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_next.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 \
-	rclock.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 \
-	star-off.png \
-	star-on.png \
-	start.jpg \
-	streaming.png \
-	subt.png \
-	subt_gray.png \
-	timer.png \
-	tmdb.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,49 @@
+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_option_off_active.png \
+	btn_option_off_inactive.png \
+	btn_option_on_active.png \
+	btn_option_on_inactive.png \
+	btn_pause.png \
+	btn_play.png \
+	btn_record_active.png \
+	btn_record_inactive.png \
+	btn_stop.png \
+	btn_timer.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 \
+	longpress.png \
+	menu.png \
+	menu_small.png \
+	mute.png \
+	mute_small.png \
+	mute_zap_gray.png \
+	mute_zap_green.png \
+	ok.png \
+	power.png \
+	right.png \
+	rot.png \
+	up.png