configure: fix short-filename logic

if configure was not called from absolute path, detection
would fail and huge filenames would be included in binary
(noticed in yocto krogoth release)

.gitignore

@@ -20,6 +20,7 @@ INSTALL
 .libs
 .deps
 *.o
+*.so
 *.lo
 *.a
 *.la

Makefile.am

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

README.md

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

acinclude.m4

@@ -11,7 +11,7 @@ AC_ARG_WITH(target,
 
 AC_ARG_WITH(targetprefix,
 	[  --with-targetprefix=PATH  prefix relative to target root (only applicable in cdk mode)],
-	[TARGET_PREFIX="$withval"],[TARGET_PREFIX="NONE"])
+	[TARGET_PREFIX="$withval"],[TARGET_PREFIX=""])
 
 AC_ARG_WITH(debug,
 	[  --without-debug         disable debugging code],
@@ -132,6 +132,8 @@ 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,
@@ -152,33 +154,18 @@ TUXBOX_APPS_DIRECTORY_ONE(libdir,LIBDIR,libdir,/lib,/tuxbox,
 TUXBOX_APPS_DIRECTORY_ONE(plugindir,PLUGINDIR,libdir,/lib,/tuxbox/plugins,
 	[--with-plugindir=PATH   ],[where to find the plugins])
 
-TUXBOX_APPS_DIRECTORY_ONE(plugindir_var,PLUGINDIR_VAR,localstatedir,/var,/tuxbox/plugins,
-	[--with-plugindir_var=PATH     ],[where to find the plugins in /var])
-
-TUXBOX_APPS_DIRECTORY_ONE(plugindir_mnt,PLUGINDIR_MNT,mntdir,/mnt,/plugins,
-	[--with-plugindir_mnt=PATH     ],[where to find the the extern plugins])
-
 TUXBOX_APPS_DIRECTORY_ONE(luaplugindir,LUAPLUGINDIR,libdir,/lib,/tuxbox/luaplugins,
 	[--with-luaplugindir=PATH   ],[where to find Lua plugins])
 
 TUXBOX_APPS_DIRECTORY_ONE(localedir,LOCALEDIR,datadir,/share, /tuxbox/neutrino/locale,
 	[--with-localedir=PATH     ],[where to find the locale])
 
-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(themesdir,THEMESDIR,datadir,/share, /tuxbox/neutrino/themes,
+TUXBOX_APPS_DIRECTORY_ONE(themesdir,THEMESDIR,datadir,/share,/tuxbox/neutrino/themes,
 	[--with-themesdir=PATH   ],[where to find the themes])
 
-TUXBOX_APPS_DIRECTORY_ONE(themesdir_var,THEMESDIR_VAR,localstatedir,/var,/tuxbox/themes,
-	[--with-themesdir_var=PATH     ],[where to find the themes in /var])
-
-TUXBOX_APPS_DIRECTORY_ONE(iconsdir,ICONSDIR,datadir,/share, /tuxbox/neutrino/icons,
+TUXBOX_APPS_DIRECTORY_ONE(iconsdir,ICONSDIR,datadir,/share,/tuxbox/neutrino/icons,
 	[--with-iconsdir=PATH    ],[where to find the icons])
 
-TUXBOX_APPS_DIRECTORY_ONE(iconsdir_var,ICONSDIR_VAR,localstatedir,/var,/tuxbox/icons,
-	[--with-iconsdir_var=PATH      ],[where to find the icons in /var])
-
 TUXBOX_APPS_DIRECTORY_ONE(private_httpddir,PRIVATE_HTTPDDIR,datadir,/share,/tuxbox/neutrino/httpd,
 	[--with-private_httpddir=PATH   ],[where to find the the private httpd files])
 
@@ -316,8 +303,13 @@ _TUXBOX_APPS_LIB_CONFIG($1,$2,WARN)
 ])
 
 AC_DEFUN([TUXBOX_APPS_PKGCONFIG],[
-AC_PATH_PROG(PKG_CONFIG, pkg-config,no)
-if test "$PKG_CONFIG" = "no" ; then
+m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+fi
+if test x"$PKG_CONFIG" = x"" ; then
 	AC_MSG_ERROR([could not find pkg-config]);
 fi
 ])
@@ -454,9 +446,9 @@ AC_SUBST(CATALOGS)
 
 AC_DEFUN([TUXBOX_BOXTYPE],[
 AC_ARG_WITH(boxtype,
-	[  --with-boxtype          valid values: dbox2,tripledragon,dreambox,ipbox,coolstream,generic],
+	[  --with-boxtype          valid values: dbox2,tripledragon,dreambox,ipbox,coolstream,spark,azbox,generic],
 	[case "${withval}" in
-		dbox2|dreambox|ipbox|tripledragon|coolstream|generic)
+		dbox2|dreambox|ipbox|tripledragon|coolstream|spark|azbox|generic)
 			BOXTYPE="$withval"
 			;;
 		dm*)
@@ -493,6 +485,13 @@ AC_ARG_WITH(boxmodel,
 				AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE])
 			fi
 			;;
+		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])
 			;;
@@ -504,11 +503,13 @@ AC_ARG_WITH(boxmodel,
 AC_SUBST(BOXTYPE)
 AC_SUBST(BOXMODEL)
 
+AM_CONDITIONAL(BOXTYPE_AZBOX, test "$BOXTYPE" = "azbox")
 AM_CONDITIONAL(BOXTYPE_DBOX2, test "$BOXTYPE" = "dbox2")
 AM_CONDITIONAL(BOXTYPE_TRIPLE, test "$BOXTYPE" = "tripledragon")
 AM_CONDITIONAL(BOXTYPE_DREAMBOX, test "$BOXTYPE" = "dreambox")
 AM_CONDITIONAL(BOXTYPE_IPBOX, test "$BOXTYPE" = "ipbox")
 AM_CONDITIONAL(BOXTYPE_COOL, test "$BOXTYPE" = "coolstream")
+AM_CONDITIONAL(BOXTYPE_SPARK, test "$BOXTYPE" = "spark")
 AM_CONDITIONAL(BOXTYPE_GENERIC, test "$BOXTYPE" = "generic")
 
 AM_CONDITIONAL(BOXMODEL_NEVIS,test "$BOXMODEL" = "nevis")
@@ -525,8 +526,12 @@ 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])
+elif 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
@@ -535,6 +540,8 @@ elif test "$BOXTYPE" = "ipbox"; then
 	AC_DEFINE(HAVE_IPBOX_HARDWARE, 1, [building for an ipbox])
 elif test "$BOXTYPE" = "coolstream"; then
 	AC_DEFINE(HAVE_COOL_HARDWARE, 1, [building for a coolstream])
+elif test "$BOXTYPE" = "spark"; then
+	AC_DEFINE(HAVE_SPARK_HARDWARE, 1, [building for a goldenmedia 990 or edision pingulux])
 elif test "$BOXTYPE" = "generic"; then
 	AC_DEFINE(HAVE_GENERIC_HARDWARE, 1, [building for a generic device like a standard PC])
 fi
@@ -554,6 +561,8 @@ elif test "$BOXMODEL" = "ip350"; then
 	AC_DEFINE(BOXMODEL_IP350, 1, [ipbox 350])
 elif test "$BOXMODEL" = "ip400"; then
 	AC_DEFINE(BOXMODEL_IP400, 1, [ipbox 400])
+elif test "$BOXMODEL" = "raspi"; then
+	AC_DEFINE(BOXMODEL_RASPI, 1, [Raspberry pi])
 fi
 ])
 

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT(Tuxbox-Neutrino,3.4.1)
+AC_INIT(tuxbox-neutrino,1.0.1)
 AM_INIT_AUTOMAKE([1.0.1 nostdinc])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
 
@@ -13,19 +13,27 @@ AC_PROG_CXX
 AC_DISABLE_STATIC
 AM_PROG_LIBTOOL
 
-# Add build information to config.h
-# ---------------------------------
-
-# Add host to config.h
-AC_DEFINE_UNQUOTED(USED_BUILD, ["$build"], [Build system under which the program was compiled on.])
-
-# Add used CXXFLAGS to config.h
-AC_DEFINE_UNQUOTED(USED_CXXFLAGS, ["$CXXFLAGS"], [Define to the used CXXFLAGS to compile this package.])
-
-# Get compiler (version)
-AH_TEMPLATE(USED_COMPILER, [Define to name and version of used compiler])
+# Add build information to local_build_config.h.tmp
+# -------------------------------------------------
+rm -f local_build_config.h.tmp
+cat > local_build_config.h.tmp << EOF
+/* Build system under which the program was compiled on. */
+#define USED_BUILD "$build"
+/* Define to the used CXXFLAGS to compile this package. */
+#define USED_CXXFLAGS "$CXXFLAGS"
+EOF
 if COMPILER=`$CC --version | head -n 1`; then
-    AC_DEFINE_UNQUOTED(USED_COMPILER, ["$COMPILER"])
+	cat >> local_build_config.h.tmp <<-EOF
+	/* Define to name and version of used compiler */
+	#define USED_COMPILER "$COMPILER"
+	EOF
+fi
+# only update header if it differs to avoid unnecessary rebuilds
+if ! diff local_build_config.h.tmp local_build_config.h >/dev/null 2>&1; then
+	rm -f local_build_config.h
+	mv local_build_config.h.tmp local_build_config.h
+else
+	rm -f local_build_config.h.tmp
 fi
 
 AC_ARG_ENABLE(ffmpegdec,
@@ -91,19 +99,6 @@ 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)
-CPPFLAGS+=" $(freetype-config --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])
-	])
-
 # 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)
@@ -117,7 +112,16 @@ TUXBOX_APPS_LIB_PKGCONFIG(PNG,libpng)
 TUXBOX_APPS_LIB_PKGCONFIG(AVFORMAT,libavformat)
 TUXBOX_APPS_LIB_PKGCONFIG(AVCODEC,libavcodec)
 TUXBOX_APPS_LIB_PKGCONFIG(AVUTIL,libavutil)
-TUXBOX_APPS_LIB_PKGCONFIG(BLURAY,libbluray)
+if test "$BOXTYPE" = "coolstream"; then
+	TUXBOX_APPS_LIB_PKGCONFIG(BLURAY,libbluray)
+fi
+
+if test "$BOXTYPE" = "coolstream" ||
+   test "$BOXTYPE" = "tripledragon" ||
+   test "$BOXTYPE" = "spark"; then
+	AC_DEFINE(SCREENSHOT,1,[Define to 1 if the platform supports screenshots])
+fi
+
 TUXBOX_APPS_LIB_PKGCONFIG(SIGC,sigc++-2.0)
 
 #TUXBOX_APPS_LIB_PKGCONFIG(CONFIGFILE,tuxbox-configfile)
@@ -192,10 +196,35 @@ if test "$enable_upnp" = "yes"; then
 	AC_DEFINE(ENABLE_UPNP,1,[include UPNP support - currently broken])
 fi
 
+AC_ARG_ENABLE(extupdate,
+	AS_HELP_STRING(--enable-extupdate,include extended update routine),
+	,[enable_extupdate=no])
+
+AM_CONDITIONAL(ENABLE_EXTUPDATE,test "$enable_extupdate" = "yes")
+if test "$enable_extupdate" = "yes"; then
+	AC_DEFINE(ENABLE_EXTUPDATE,1,[include extended update routine])
+fi
+
+AC_ARG_WITH(stb-hal-includes,
+	[  --with-stb-hal-includes=PATH  path for libstb-hal includes [[NONE]]],
+	[STB_HAL_INC="$withval"],[STB_HAL_INC=""])
+AC_ARG_WITH(stb-hal-build,
+	[  --with-stb-hal-build=PATH   path where libstb-hal is built [[NONE]]],
+	[STB_HAL_LIB="-L$withval"],[STB_HAL_LIB=""])
+
+AM_CONDITIONAL(USE_STB_HAL, test "$BOXTYPE" != "coolstream")
+if test "$BOXTYPE" != coolstream; then
+	AC_DEFINE(USE_STB_HAL, 1,[use libstb-hal])
+	if test "$STB_HAL_INC" = ""; then
+		AC_MSG_ERROR([need libstb-hal includes path with --with-stb-hal-includes=...])
+	fi
+	HWLIB_CFLAGS="-I$STB_HAL_INC"
+fi
+
 # Lua - embeddable scripting language
 AC_ARG_ENABLE(lua,
-	AS_HELP_STRING(--enable-lua,include Lua support),
-	,[enable_lua=no])
+	AS_HELP_STRING(--disable-lua,disable Lua support),
+	,[enable_lua=yes])
 
 AM_CONDITIONAL(ENABLE_LUA,test "$enable_lua" = "yes")
 if test "$enable_lua" = "yes"; then
@@ -236,23 +265,21 @@ fi
 HWLIB_CFLAGS='-I$(top_srcdir)/lib/libcoolstream -I$(top_srcdir)/src/zapit/include/private'
 
 if test "$BOXMODEL" = "apollo"; then
+HWLIB_CFLAGS='-I$(top_srcdir)/lib/libcoolstream2 -I$(top_srcdir)/src/zapit/include/private'
 if test -e ${srcdir}/lib/libcoolstream2/cs_ir_generic.h; then
 	AC_DEFINE(HAVE_COOLSTREAM_CS_IR_GENERIC_H,1,[Define to 1 if you have the <cs_ir_generic.h> header file.])
 fi
 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.])
 fi
-HWLIB_CFLAGS='-I$(top_srcdir)/lib/libcoolstream2 -I$(top_srcdir)/src/zapit/include/private'
 fi
 fi
 
 # hack to define a short filename also for out-of-tree build
 if test `dirname $0` = `pwd` || test "$0" = ./configure; then
 	HWLIB_CFLAGS="$HWLIB_CFLAGS "'-D__file__=__FILE__'
-	HWLIB_CFLAGS="$HWLIB_CFLAGS "'-D__path_file__=__FILE__'
 else
 	HWLIB_CFLAGS="$HWLIB_CFLAGS "'-D__file__="\"$(subst $(srcdir)/,,$(abspath $<))\""'
-	HWLIB_CFLAGS="$HWLIB_CFLAGS "'-D__path_file__="\"$(subst $(top_srcdir)/,,$(abspath $<))\""'
 fi
 
 AC_SUBST(HWLIB_CFLAGS)
@@ -260,87 +287,72 @@ 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/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/scripts/Makefile
-data/themes/Makefile
-data/y-web/Makefile
-data/y-web/images/Makefile
-data/y-web/languages/Makefile
-data/y-web/scripts/Makefile
-data/y-web/styles/Makefile
 lib/Makefile
-lib/connection/Makefile
-lib/jsoncpp/Makefile
 lib/libconfigfile/Makefile
-lib/libdvbsub/Makefile
+lib/connection/Makefile
 lib/libeventserver/Makefile
-lib/libiw/Makefile
 lib/libmd5sum/Makefile
 lib/libnet/Makefile
-lib/libtuxtxt/Makefile
-lib/libupnpclient/Makefile
-lib/luaclient/Makefile
+lib/xmltree/Makefile
+lib/jsoncpp/Makefile
 lib/sectionsdclient/Makefile
 lib/timerdclient/Makefile
-lib/xmltree/Makefile
+lib/libcoolstream/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
 src/Makefile
 src/daemonc/Makefile
-src/driver/Makefile
-src/driver/audiodec/Makefile
 src/driver/pictureviewer/Makefile
-src/eitd/Makefile
+src/driver/audiodec/Makefile
+src/driver/Makefile
 src/gui/Makefile
 src/gui/bedit/Makefile
 src/gui/components/Makefile
 src/gui/lua/Makefile
-src/gui/moviebrowser/Makefile
 src/gui/widget/Makefile
-src/lcddisplay/Makefile
-src/nhttpd/Makefile
-src/nhttpd/nhttpd.conf
-src/nhttpd/tuxboxapi/Makefile
-src/nhttpd/yhttpd_core/Makefile
-src/nhttpd/yhttpd_mods/Makefile
 src/system/Makefile
 src/system/mtdutils/Makefile
 src/system/mtdutils/lib/Makefile
+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/data/Makefile
 src/zapit/lib/Makefile
 src/zapit/src/Makefile
+src/zapit/data/Makefile
 ])

data/Makefile.am

@@ -1,16 +1,4 @@
-SUBDIRS = \
-	fonts \
-	icons \
-	inetradio \
-	initial \
-	iso-codes \
-	license \
-	locale \
-	neutrino-scripts \
-	pictures \
-	scripts \
-	themes \
-	y-web
+SUBDIRS = fonts icons inetradio initial iso-codes license locale scripts themes neutrino-scripts
 
 if BOXTYPE_TRIPLE
 SUBDIRS += lcd

data/cables.xml

@@ -220,10 +220,11 @@
 		<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="113000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="114000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<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="3"/>
 		<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"/>
@@ -244,27 +245,32 @@
 		<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="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="682000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="690000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="698000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="706000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="730000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="738000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="746000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="754000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
 		<transponder frequency="762000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
 		<transponder frequency="770000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
 		<transponder frequency="778000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
 		<transponder frequency="786000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
 		<transponder frequency="794000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="802000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<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"/>
-		<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"/>
@@ -506,27 +512,22 @@
 		<transponder frequency="458000" symbol_rate="6111000" fec_inner="0" modulation="3"/>
 		<transponder frequency="466000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
 		<transponder frequency="474000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="482000" symbol_rate="6111000" fec_inner="0" modulation="3"/>
+		<transponder frequency="482000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
 		<transponder frequency="490000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
 		<transponder frequency="498000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
 		<transponder frequency="506000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
 		<transponder frequency="514000" symbol_rate="6111000" fec_inner="0" modulation="3"/>
 		<transponder frequency="522000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="530000" symbol_rate="6111000" fec_inner="0" modulation="3"/>
+		<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="6111000" fec_inner="0" modulation="3"/>
+		<transponder frequency="546000" symbol_rate="6110000" fec_inner="0" modulation="3"/>
 		<transponder frequency="554000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
 		<transponder frequency="562000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="570000" symbol_rate="6111000" fec_inner="0" modulation="3"/>
+		<transponder frequency="570000" symbol_rate="6110000" fec_inner="0" modulation="3"/>
 		<transponder frequency="578000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="586000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="594000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="602000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="610000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="618000" symbol_rate="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"/>
 	</cable>
 	<cable name="Antennengemeinschaft Penig" satfeed="true" flags="9">
 		<transponder frequency="129000" symbol_rate="6900000" fec_inner="0" modulation="3"/>

data/epgmap.xml

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

data/icons/Makefile.am

@@ -1,11 +1,275 @@
-SUBDIRS = \
-	buttons \
-	filetypes \
-	headers \
-	hints \
-	locale \
-	movieplayer \
-	radar \
-	slider \
-	status \
-	various
+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_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 \
+	start.jpg \
+	streaming.png \
+	subt.png \
+	subt_gray.png \
+	timer.png \
+	tuner_1.png \
+	tuner_2.png \
+	tuner_3.png \
+	tuner_4.png \
+	up.png \
+	upnp.png \
+	via_green.png \
+	via_white.png \
+	via_yellow.png \
+	video.png \
+	volume.png \
+	volumebody.png \
+	volumeslider2.png \
+	volumeslider2alpha.png \
+	volumeslider2blue.png \
+	volumeslider2green.png \
+	volumeslider2red.png \
+	vtxt.png \
+	vtxt_gray.png \
+	warning.png \
+	x_green.png \
+	x_white.png \
+	x_yellow.png \
+	zap.png
+

data/icons/buttons/Makefile.am

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

data/icons/filetypes/Makefile.am

@@ -1,6 +0,0 @@
-installdir = $(ICONSDIR)
-
-install_DATA = \
-	file.png \
-	folder.png \
-	movie.png

data/icons/headers/Makefile.am

@@ -1,31 +0,0 @@
-installdir = $(ICONSDIR)
-
-install_DATA = \
-	audio.png \
-	bookmarkmanager.png \
-	colors.png \
-	error.png \
-	features.png \
-	games.png \
-	icon_green.png \
-	icon_movieplayer.png \
-	icon_red.png \
-	icon_yellow.png \
-	icon_ytplay.png \
-	information.png \
-	keybinding.png \
-	language.png \
-	lcd.png \
-	mainmenue.png \
-	mp3.png \
-	multimedia.png \
-	network.png \
-	personalize.png \
-	recording.png \
-	settings.png \
-	shell.png \
-	softupdate.png \
-	streaming.png \
-	timer.png \
-	upnp.png \
-	video.png