update to version 3.8.0

Note:
Contents of policy files are not available with this commit. This
should be done related to own conditions by provider himself.
Providers are required by law to do this for their users as well.

Files must be installed in:

	installdir = $(DATADIR)/neutrino/policy

Providers should modify their buildsystem to install these files.
Filename sheme is
	<locale>.policy. eg 'english.policy'

If you want to add a policy file, take a look into sample file
	locale.policy.sample

Makefile.am

@@ -1,5 +1,3 @@
-AUTOMAKE_OPTIONS = gnu
-
 SUBDIRS = lib src data
 
 locale-update:

acinclude.m4

@@ -1,41 +1,137 @@
-AC_DEFUN([TUXBOX_APPS],[
+AC_DEFUN([TUXBOX_APPS], [
 AM_CONFIG_HEADER(config.h)
 AM_MAINTAINER_MODE
 
 AC_GNU_SOURCE
 
 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=""])
+	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
 
+
+# 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,
-	[  --with-libcoolstream-static-dir=PATH  path for static libcoolstream],
-	[LIBCOOLSTREAM_STATIC_DIR="$withval"],[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]))
-AM_CONDITIONAL(ENABLE_LIBCOOLSTREAM_STATIC,test "$enable_libcoolstream_static" = "yes")
+	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)))
+	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")
 
-AM_CONDITIONAL(ENABLE_RESCHANGE,test "$enable_reschange" = "yes")
-if test "$enable_reschange" = "yes"; then
-	AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION,1,[enable change the osd resolution])
-fi
+# 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)
 
@@ -49,11 +145,12 @@ 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)
 
@@ -67,7 +164,7 @@ elif test "$TARGET" = "cdk"; 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])
@@ -82,16 +179,16 @@ 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}"
@@ -99,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
@@ -108,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
@@ -118,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
@@ -142,71 +238,77 @@ 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(fontdir_var,FONTDIR_VAR,localstatedir,/var,/tuxbox/fonts,
-	[--with-fontdir_var=PATH       ],[where to find the fonts in /var])
+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(gamesdir,GAMESDIR,localstatedir,/var,/tuxbox/games,
-	[--with-gamesdir=PATH          ],[where games data is stored])
+TUXBOX_APPS_DIRECTORY_ONE(gamesdir, GAMESDIR, localstatedir, /var, /tuxbox/games,
+	[--with-gamesdir=PATH], [where to find games])
 
-TUXBOX_APPS_DIRECTORY_ONE(libdir,LIBDIR,libdir,/lib,/tuxbox,
-	[--with-libdir=PATH            ],[where to find the internal libs])
+TUXBOX_APPS_DIRECTORY_ONE(libdir, LIBDIR, libdir, /lib, /tuxbox,
+	[--with-libdir=PATH], [where to find internal libs])
 
-TUXBOX_APPS_DIRECTORY_ONE(plugindir,PLUGINDIR,libdir,/lib,/tuxbox/plugins,
-	[--with-plugindir=PATH         ],[where to find the plugins])
+TUXBOX_APPS_DIRECTORY_ONE(plugindir, PLUGINDIR, libdir, /lib, /tuxbox/plugins,
+	[--with-plugindir=PATH], [where to find plugins])
 
-TUXBOX_APPS_DIRECTORY_ONE(plugindir_var,PLUGINDIR_VAR,localstatedir,/var,/tuxbox/plugins,
-	[--with-plugindir_var=PATH     ],[where to find the plugins in /var])
+TUXBOX_APPS_DIRECTORY_ONE(plugindir_var, PLUGINDIR_VAR, localstatedir, /var, /tuxbox/plugins,
+	[--with-plugindir_var=PATH], [where to find plugins in /var])
 
-TUXBOX_APPS_DIRECTORY_ONE(webtvdir_var,WEBTVDIR_VAR,localstatedir,/var,/tuxbox/plugins/webtv,
-	[--with-webtvdir_var=PATH      ],[where to find the livestreamScriptPath in /var])
+TUXBOX_APPS_DIRECTORY_ONE(plugindir_mnt, PLUGINDIR_MNT, mntdir, /mnt, /plugins,
+	[--with-plugindir_mnt=PATH], [where to find external plugins])
 
-TUXBOX_APPS_DIRECTORY_ONE(webtvdir,WEBTVDIR,datadir,/share,/tuxbox/neutrino/webtv,
-	[--with-webtvdir=PATH          ],[where to find the webtv content])
+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 the the extern plugins])
+TUXBOX_APPS_DIRECTORY_ONE(webradiodir, WEBRADIODIR, datadir, /share, /tuxbox/neutrino/webradio,
+	[--with-webradiodir=PATH], [where to find webradio content])
 
-TUXBOX_APPS_DIRECTORY_ONE(luaplugindir,LUAPLUGINDIR,libdir,/lib,/tuxbox/luaplugins,
-	[--with-luaplugindir=PATH      ],[where to find Lua plugins])
+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(localedir,LOCALEDIR,datadir,/share, /tuxbox/neutrino/locale,
-	[--with-localedir=PATH         ],[where to find the locale])
+TUXBOX_APPS_DIRECTORY_ONE(webtvdir, WEBTVDIR, datadir, /share, /tuxbox/neutrino/webtv,
+	[--with-webtvdir=PATH], [where to find webtv content])
 
-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(webtvdir_var, WEBTVDIR_VAR, localstatedir, /var, /tuxbox/webtv,
+	[--with-webtvdir_var=PATH], [where to find webtv content in /var])
 
-TUXBOX_APPS_DIRECTORY_ONE(themesdir,THEMESDIR,datadir,/share, /tuxbox/neutrino/themes,
-	[--with-themesdir=PATH         ],[where to find the themes])
+TUXBOX_APPS_DIRECTORY_ONE(localedir, LOCALEDIR,datadir, /share, /tuxbox/neutrino/locale,
+	[--with-localedir=PATH], [where to find locale])
 
-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(localedir_var, LOCALEDIR_VAR, localstatedir, /var, /tuxbox/locale,
+	[--with-localedir_var=PATH], [where to find locale in /var])
 
-TUXBOX_APPS_DIRECTORY_ONE(iconsdir,ICONSDIR,datadir,/share, /tuxbox/neutrino/icons,
-	[--with-iconsdir=PATH          ],[where to find the icons])
+TUXBOX_APPS_DIRECTORY_ONE(themesdir, THEMESDIR, datadir, /share, /tuxbox/neutrino/themes,
+	[--with-themesdir=PATH], [where to find themes])
 
-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(themesdir_var, THEMESDIR_VAR, localstatedir, /var, /tuxbox/themes,
+	[--with-themesdir_var=PATH], [where to find themes in /var])
 
-TUXBOX_APPS_DIRECTORY_ONE(private_httpddir,PRIVATE_HTTPDDIR,datadir,/share,/tuxbox/neutrino/httpd,
-	[--with-private_httpddir=PATH  ],[where to find the the private httpd files])
+TUXBOX_APPS_DIRECTORY_ONE(iconsdir, ICONSDIR, datadir, /share, /tuxbox/neutrino/icons,
+	[--with-iconsdir=PATH], [where to find icons])
 
-TUXBOX_APPS_DIRECTORY_ONE(public_httpddir,PUBLIC_HTTPDDIR,localstatedir,/var,/tuxbox/httpd,
-	[--with-public_httpddir=PATH   ],[where to find the the public httpd files])
+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(hosted_httpddir,HOSTED_HTTPDDIR,mntdir,/mnt,/hosted,
-	[--with-hosted_httpddir=PATH   ],[where to find the the hosted files])
+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(flagdir,FLAGDIR,localstatedir,/var,/etc,
-	[--with-flagdir=PATH           ],[where to find flagfiles])
+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
@@ -214,16 +316,17 @@ AC_SUBST(CONFIGDIR)
 AC_SUBST(DATADIR)
 AC_SUBST(FONTDIR)
 AC_SUBST(FONTDIR_VAR)
-AC_SUBST(FLAGDIR)
 AC_SUBST(GAMESDIR)
 AC_SUBST(LIBDIR)
 AC_SUBST(MNTDIR)
 AC_SUBST(PLUGINDIR)
 AC_SUBST(PLUGINDIR_VAR)
-AC_SUBST(WEBTVDIR)
-AC_SUBST(WEBTVDIR_VAR)
 AC_SUBST(PLUGINDIR_MNT)
 AC_SUBST(LUAPLUGINDIR)
+AC_SUBST(WEBRADIODIR)
+AC_SUBST(WEBRADIODIR_VAR)
+AC_SUBST(WEBTVDIR)
+AC_SUBST(WEBTVDIR_VAR)
 AC_SUBST(LOCALEDIR)
 AC_SUBST(LOCALEDIR_VAR)
 AC_SUBST(THEMESDIR)
@@ -235,7 +338,7 @@ AC_SUBST(PUBLIC_HTTPDDIR)
 AC_SUBST(HOSTED_HTTPDDIR)
 dnl end workaround
 
-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
@@ -255,23 +358,22 @@ 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_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
@@ -283,7 +385,7 @@ if test x"$PKG_CONFIG" = x"" ; then
 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
@@ -294,37 +396,38 @@ 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_BOXTYPE],[
+AC_DEFUN([TUXBOX_BOXTYPE], [
 AC_ARG_WITH(boxtype,
-	[  --with-boxtype          valid values: tripledragon,coolstream,spark,azbox,generic,armbox],
+	AS_HELP_STRING([--with-boxtype], [valid values: tripledragon, coolstream, spark, azbox, generic, armbox]),
 	[case "${withval}" in
 		tripledragon|coolstream|spark|azbox|generic|armbox)
 			BOXTYPE="$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: hd1, hd2
-			valid for armbox: hd51
-			valid for generic: raspi],
+	AS_HELP_STRING([--with-boxmodel], [valid for coolstream: hd1, hd2])
+AS_HELP_STRING([], [valid for armbox: hd51])
+AS_HELP_STRING([], [valid for generic: raspi]),
 	[case "${withval}" in
 		hd1|hd2)
 			if test "$BOXTYPE" = "coolstream"; then
@@ -362,8 +465,7 @@ AC_ARG_WITH(boxmodel,
 		*)
 			AC_MSG_ERROR([unsupported value $withval for --with-boxmodel])
 		;;
-	esac], [test "$BOXTYPE" = "coolstream" && BOXMODEL="hd1" || true]
-	)
+	esac])
 
 AC_SUBST(BOXTYPE)
 AC_SUBST(BOXMODEL)
@@ -375,10 +477,10 @@ AM_CONDITIONAL(BOXTYPE_SPARK, test "$BOXTYPE" = "spark")
 AM_CONDITIONAL(BOXTYPE_GENERIC, test "$BOXTYPE" = "generic")
 AM_CONDITIONAL(BOXTYPE_ARMBOX, test "$BOXTYPE" = "armbox")
 
-AM_CONDITIONAL(BOXMODEL_CS_HD1,test "$BOXMODEL" = "hd1")
-AM_CONDITIONAL(BOXMODEL_CS_HD2,test "$BOXMODEL" = "hd2")
+AM_CONDITIONAL(BOXMODEL_CS_HD1, test "$BOXMODEL" = "hd1")
+AM_CONDITIONAL(BOXMODEL_CS_HD2, test "$BOXMODEL" = "hd2")
 
-AM_CONDITIONAL(BOXMODEL_RASPI,test "$BOXMODEL" = "raspi")
+AM_CONDITIONAL(BOXMODEL_RASPI, test "$BOXMODEL" = "raspi")
 
 if test "$BOXTYPE" = "azbox"; then
 	AC_DEFINE(HAVE_AZBOX_HARDWARE, 1, [building for an azbox])
@@ -399,32 +501,35 @@ 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])
+	AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION, 1, [enable change the osd resolution])
 elif test "$BOXMODEL" = "hd51"; then
-	AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION,1,[enable change the osd resolution])
+	AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION, 1, [enable change the osd resolution])
 elif test "$BOXMODEL" = "raspi"; then
-	AC_DEFINE(BOXMODEL_RASPI, 1, [Raspberry pi])
+	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,7 +1,9 @@
-AC_INIT(Tuxbox-Neutrino,3.6.1)
-AM_INIT_AUTOMAKE([1.0.1 nostdinc])
+AC_INIT(Tuxbox-Neutrino,3.8.0)
+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])
+
 TUXBOX_APPS
 TUXBOX_APPS_DIRECTORY
 TUXBOX_APPS_PKGCONFIG
@@ -36,23 +38,19 @@ else
 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])
 
@@ -62,7 +60,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
@@ -84,35 +82,34 @@ 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)
 
 ## For the check you must use the corresponding libtool number as version number,
 ## see freetype source code docs/VERSIONS.TXT
-PKG_CHECK_MODULES([FREETYPE], [freetype2 >= 16.2.10],
-	[echo "freetype2 >= 2.5.0 found"], [
-	## If freetype is not found:
-	## Activate this line if you want to search with freetype-config instead
-	[echo "freetype2 >= 2.5.0 not found, use alternative search method with freetype-config"]
-	## Activate this line if you want to abort
-#	AC_MSG_ERROR([freetype2 >= 2.5.0 not found])
-	])
+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)
@@ -124,9 +121,10 @@ if test -z "$FREETYPE_LIBS" -a -z "$FREETYPE_CFLAGS"; then
 		#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])
+	], [
+		AC_MSG_RESULT(yes)
+	], [
+		AC_MSG_ERROR([Need FreeType library version 2.5.0 or higher])
 	])
 fi
 
@@ -134,179 +132,155 @@ 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(SIGC,sigc++-2.0)
+
+if test "$BOXTYPE" = "armbox"; then
+	TUXBOX_APPS_LIB_PKGCONFIG(SWSCALE,libswscale)
+fi
+
 if test "$BOXTYPE" = "coolstream"; then
 	TUXBOX_APPS_LIB_PKGCONFIG(BLURAY,libbluray)
 fi
 
 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])
+	AC_DEFINE(SCREENSHOT, 1, [Define to 1 if the platform supports screenshots])
 fi
 
-TUXBOX_APPS_LIB_PKGCONFIG(SIGC,sigc++-2.0)
-
-#TUXBOX_APPS_LIB_PKGCONFIG(CONFIGFILE,tuxbox-configfile)
-#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])])
+	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,
-	[  --enable-mdev disable broken neutrino mount hack, use with mdev],
-	[AC_DEFINE(ASSUME_MDEV,1,[disable broken neutrino mount hack, use with 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,
-	[  --enable-freesatepg                  enable Freesat EPG code (experimental)],
-	[AC_DEFINE(ENABLE_FREESATEPG,1,[enable Freesat EPG code])])
+	AS_HELP_STRING([--enable-freesatepg], [enable Freesat EPG code @<:@default=no@:>@]),
+	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])])
+	AS_HELP_STRING([--enable-viasatepg], [enable ViaSat EPG code @<:@default=no@:>@]),
+	AC_DEFINE(ENABLE_VIASATEPG, 1, [enable ViaSat EPG code]))
 
 AC_ARG_ENABLE(fastscan,
-	[  --enable-fastscan                   enable Fastscan code)],
-	[AC_DEFINE(ENABLE_FASTSCAN,1,[enable fastscan code])])
-
+	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),
-	,[enable_giflib=no])
+	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")
 
-AM_CONDITIONAL(ENABLE_GIFLIB,test "$enable_giflib" = "yes")
-if test "$enable_giflib" = "yes"; then
-	AC_DEFINE(ENABLE_GIFLIB,1,[use giflib instead of libungif])
-fi
-
-### USE_PUGIXML
 AC_ARG_ENABLE(pugixml,
-       AS_HELP_STRING(--enable-pugixml,use pugixml instead of xmltree),
-       ,[enable_pugixml=no])
+	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")
 
-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])
+	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")
 
-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])
+	AS_HELP_STRING([--enable-upnp], [enable UPNP support @<:@default=yes@:>@]),
+	[enable_upnp="$enableval"],
+	[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])
+	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,include extended update routine),
-	,[enable_extupdate=no])
+	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")
 
-AM_CONDITIONAL(ENABLE_EXTUPDATE,test "$enable_extupdate" = "yes")
-if test "$enable_extupdate" = "yes"; then
-	AC_DEFINE(ENABLE_EXTUPDATE,1,[include extended update routine])
+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,
-	[  --with-stb-hal-includes=PATH  path for libstb-hal includes [[NONE]]],
-	[STB_HAL_INC="$withval"],[STB_HAL_INC=""])
-AC_ARG_WITH(stb-hal-build,
-	[  --with-stb-hal-build=PATH   path where libstb-hal is built [[NONE]]],
-	[STB_HAL_LIB="-L$withval"],[STB_HAL_LIB=""])
+	AS_HELP_STRING([--with-stb-hal-includes=PATH], [path for libstb-hal includes [[NONE]]]),
+	[STB_HAL_INC="$withval"],
+	[STB_HAL_INC=""])
+
+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=""])
 
-AM_CONDITIONAL(USE_STB_HAL, test "$BOXTYPE" != "coolstream")
 if test "$BOXTYPE" != coolstream; then
-	AC_DEFINE(USE_STB_HAL, 1,[use libstb-hal])
+	AC_DEFINE(USE_STB_HAL, 1, [use libstb-hal])
 	if test "$STB_HAL_INC" = ""; then
 		AC_MSG_ERROR([need libstb-hal includes path with --with-stb-hal-includes=...])
 	fi
 	HWLIB_CFLAGS="-I$STB_HAL_INC"
 fi
-
-# Lua - embeddable scripting language
-AC_ARG_ENABLE(lua,
-	AS_HELP_STRING(--disable-lua,disable Lua support),
-	,[enable_lua=yes])
-
-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
-
-AC_ARG_ENABLE([fribidi],
-	AS_HELP_STRING([--enable-fribidi], [enable fribidi support])
-)
-AM_CONDITIONAL(ENABLE_FRIBIDI, test "$enable_fribidi" = "yes")
-AS_IF([test "$enable_fribidi" = "yes"],
-	AC_DEFINE(ENABLE_FRIBIDI, 1, [enable fribidi support])
-)
+AM_CONDITIONAL(USE_STB_HAL, test "$BOXTYPE" != "coolstream")
 
 if test "$BOXTYPE" = "coolstream"; then
-if test -e ${srcdir}/lib/hardware/coolstream/hd1/libcoolstream/nevis_ir.h; then
-	AC_DEFINE(HAVE_COOLSTREAM_NEVIS_IR_H,1,[Define to 1 if you have the <nevis_ir.h> header file.])
-fi
-HWLIB_CFLAGS='-I$(top_srcdir)/lib/hardware/coolstream/hd1/libcoolstream'
+	if test "$BOXMODEL" = "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'
+	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...
@@ -363,8 +337,18 @@ 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/y-web/Makefile
 data/y-web/images/Makefile
 data/y-web/languages/Makefile
@@ -398,6 +382,7 @@ 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

data/Makefile.am

@@ -8,6 +8,7 @@ SUBDIRS = \
 	locale \
 	neutrino-scripts \
 	pictures \
+	policy \
 	scripts \
 	themes \
 	y-web
@@ -17,7 +18,19 @@ 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
 
+config_DATA = \
+	bad_package_pattern.list.sample \
+	cables.xml \
+	encoding.conf \
+	epglanguages.conf \
+	myservices.xml \
+	providermap.xml \
+	satellites.xml \
+	settingsupdate.conf \
+	terrestrial.xml \
+	tobackup.conf \
+	webradio_usr.xml \
+	webtv_usr.xml
 install-data-hook:
 	$(INSTALL) -d $(DESTDIR)/$(CONFIGDIR)/zapit

data/bad_package_pattern.list.sample

@@ -1,11 +1,95 @@
--dev$
--doc$
--dbg$
--ptest$
--staticdev$
--locale-
--charmap-
--gconv-
--localedata-
 ^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/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<EFBFBD>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<EFBFBD>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"/>
@@ -220,53 +220,6 @@
 		<transponder frequency="698000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 	</cable>
 	<cable name="Unitymedia" 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="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="Unitymedia 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"/>
@@ -311,6 +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="610000" 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"/>
@@ -485,7 +439,9 @@
 		<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<EFBFBD>ltzschtalbr<EFBFBD>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"/>
@@ -534,10 +490,11 @@
 		<transponder frequency="594000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="602000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="610000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="618000" symbol_rate="6111000" fec_inner="0" modulation="3"/>
+		<transponder frequency="618000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
 		<transponder frequency="626000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="634000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="642000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<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"/>
@@ -566,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<EFBFBD>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"/>
@@ -1440,6 +1397,53 @@
 		<transponder frequency="626000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="642000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 	</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"/>
 		<transponder frequency="314000" symbol_rate="6900000" fec_inner="0" modulation="5"/>

data/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,20 +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 = \
-	LiberationSans-Bold.ttf \
-	LiberationSans-BoldItalic.ttf \
-	LiberationSans-Italic.ttf \
+	$(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_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/icons/buttons/Makefile.am

@@ -14,11 +14,16 @@ install_DATA = \
 	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 \
@@ -30,8 +35,10 @@ install_DATA = \
 	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 \

data/icons/headers/Makefile.am

@@ -16,11 +16,13 @@ install_DATA = \
 	keybinding.png \
 	language.png \
 	lcd.png \
+	lock.png \
 	mainmenue.png \
 	multimedia.png \
 	network.png \
 	personalize.png \
 	pictureviewer.png \
+	question.png \
 	recording.png \
 	settings.png \
 	shell.png \

data/icons/hints/Makefile.am

@@ -6,11 +6,14 @@ install_DATA = \
 	hint_aplay.png \
 	hint_audio.png \
 	hint_back.png \
+	hint_backup.png \
 	hint_bedit.png \
 	hint_ci.png \
 	hint_dboxinfo.png \
+	hint_default.png \
 	hint_delete.png \
 	hint_extended.png \
+	hint_factory.png \
 	hint_fileplay.png \
 	hint_games.png \
 	hint_hdd.png \
@@ -19,6 +22,7 @@ install_DATA = \
 	hint_info.png \
 	hint_keys.png \
 	hint_language.png \
+	hint_load.png \
 	hint_manage.png \
 	hint_mb.png \
 	hint_media.png \
@@ -34,8 +38,11 @@ install_DATA = \
 	hint_reboot.png \
 	hint_recording.png \
 	hint_reload.png \
+	hint_reset.png \
 	hint_restart.png \
+	hint_restore.png \
 	hint_save.png \
+	hint_saveas.png \
 	hint_scan.png \
 	hint_scripts.png \
 	hint_service.png \
@@ -49,4 +56,6 @@ install_DATA = \
 	hint_tvradio_switch.png \
 	hint_vfd.png \
 	hint_video.png \
+	hint_webtv.png \
+	hint_xmltv.png \
 	hint_ytplay.png

data/icons/status/ca/Makefile.am

@@ -28,6 +28,9 @@ install_DATA = \
 	seca_green.png \
 	seca_white.png \
 	seca_yellow.png \
+	tan_green.png \
+	tan_white.png \
+	tan_yellow.png \
 	via_green.png \
 	via_white.png \
 	via_yellow.png \