Fix conflict

.gitignore

@@ -20,17 +20,11 @@ INSTALL
 .libs
 .deps
 *.o
-*.so
 *.lo
 *.a
 *.la
 .*.swp
 
-### editor crap
-*.orig
-*.rej
-*~
-
 ### binaries that fall out of the build
 lib/sectionsdclient/sectionsdcontrol
 src/neutrino
@@ -38,16 +32,4 @@ src/nhttpd/web/*.js.gz
 src/zapit/src/pzapit
 src/zapit/src/udpstreampes
 src/drivertool
-src/dt
+src/gui/svn_version.h
-src/rcsim.h
-src/rcsim
-src/gui/version.h
-src/nhttpd/nhttpd.conf
-src/mdev_helper
-local_build_config.h
-
-### system generated stuff
-# dolphin
-.directory
-# kate
-*-swp

Makefile.am

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

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=""])
+	[targetprefix="$withval"],[targetprefix="NONE"])
 
 AC_ARG_WITH(debug,
 	[  --without-debug         disable debugging code],
@@ -22,11 +22,6 @@ if test "$DEBUG" = "yes"; then
 	AC_DEFINE(DEBUG,1,[Enable debug messages])
 fi
 
-AC_ARG_ENABLE(tmsdk,
-        AS_HELP_STRING(--enable-tmsdk,         compile inside sdk),
-        ,[enable_tmsdk=no])
-AM_CONDITIONAL(ENABLE_TMSDK,test "$enable_tmsdk" = "yes")
-
 AC_MSG_CHECKING(target)
 
 if test "$TARGET" = "native"; then
@@ -39,10 +34,6 @@ 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
 elif test "$TARGET" = "cdk"; then
 	AC_MSG_RESULT(cdk)
@@ -55,14 +46,10 @@ elif test "$TARGET" = "cdk"; then
 		CXXFLAGS="-Wall -Os -mcpu=823 -pipe $DEBUG_CFLAGS"
 	fi
 	if test "$prefix" = "NONE"; then
-		AC_MSG_ERROR([invalid prefix, you need to specify one in cdk mode])
+		AC_MSG_ERROR(invalid prefix, you need to specify one in cdk mode)
 	fi
-	if test "$TARGET_PREFIX" != "NONE"; then
+	if test "$targetprefix" = "NONE"; then
-		AC_DEFINE_UNQUOTED(TARGET_PREFIX, "$TARGET_PREFIX",[The targets prefix])
+		targetprefix=""
-	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
@@ -82,37 +69,26 @@ check_path () {
 
 ])
 
-dnl expand nested ${foo}/bar
-AC_DEFUN([TUXBOX_EXPAND_VARIABLE],[__$1="$2"
-	for __CNT in false false false false true; do dnl max 5 levels of indirection
-
-		$1=`eval echo "$__$1"`
-		echo ${$1} | grep -q '\$' || break # 'grep -q' is POSIX, exit if no $ in variable
-		__$1="${$1}"
-	done
-	$__CNT && AC_MSG_ERROR([can't expand variable $1=$2]) dnl bail out if we did not expand
-])
-
 AC_DEFUN([TUXBOX_APPS_DIRECTORY_ONE],[
 AC_ARG_WITH($1,[  $6$7 [[PREFIX$4$5]]],[
 	_$2=$withval
 	if test "$TARGET" = "cdk"; then
-		$2=`eval echo "$TARGET_PREFIX$withval"` # no indirection possible IMNSHO
+		$2=`eval echo "${targetprefix}$withval"`
 	else
 		$2=$withval
 	fi
 	TARGET_$2=${$2}
 ],[
-	# RFC 1925: "you can always add another level of indirection..."
+	$2="\${$3}$5"
-	TUXBOX_EXPAND_VARIABLE($2,"${$3}$5")
 	if test "$TARGET" = "cdk"; then
-		TUXBOX_EXPAND_VARIABLE(_$2,"${target$3}$5")
+		_$2=`eval echo "${target$3}$5"`
 	else
-		_$2=${$2}
+		_$2=`eval echo "${$3}$5"`
 	fi
 	TARGET_$2=$_$2
 ])
 
+dnl automake <= 1.6 don't support this
 dnl AC_SUBST($2)
 AC_DEFINE_UNQUOTED($2,"$_$2",$7)
 AC_SUBST(TARGET_$2)
@@ -126,14 +102,10 @@ if test "$TARGET" = "cdk"; then
 	sysconfdir="\${prefix}/etc"
 	localstatedir="\${prefix}/var"
 	libdir="\${prefix}/lib"
-	mntdir="\${prefix}/mnt"
+	targetdatadir="\${targetprefix}/share"
-	targetdatadir="\${TARGET_PREFIX}/share"
+	targetsysconfdir="\${targetprefix}/etc"
-	targetsysconfdir="\${TARGET_PREFIX}/etc"
+	targetlocalstatedir="\${targetprefix}/var"
-	targetlocalstatedir="\${TARGET_PREFIX}/var"
+	targetlibdir="\${targetprefix}/lib"
-	targetlibdir="\${TARGET_PREFIX}/lib"
-	targetmntdir="\${TARGET_PREFIX}/mnt"
-else
-	mntdir="/mnt" # hack
 fi
 
 TUXBOX_APPS_DIRECTORY_ONE(configdir,CONFIGDIR,localstatedir,/var,/tuxbox/config,
@@ -154,26 +126,11 @@ 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(luaplugindir,LUAPLUGINDIR,libdir,/lib,/tuxbox/luaplugins,
+TUXBOX_APPS_DIRECTORY_ONE(ucodedir,UCODEDIR,localstatedir,/var,/tuxbox/ucodes,
-	[--with-luaplugindir=PATH   ],[where to find Lua plugins])
+	[--with-ucodedir=PATH    ],[where to find the ucodes])
-
-TUXBOX_APPS_DIRECTORY_ONE(localedir,LOCALEDIR,datadir,/share, /tuxbox/neutrino/locale,
-	[--with-localedir=PATH     ],[where to find the locale])
 
 TUXBOX_APPS_DIRECTORY_ONE(themesdir,THEMESDIR,datadir,/share,/tuxbox/neutrino/themes,
-	[--with-themesdir=PATH   ],[where to find the themes])
+	[--with-themesdir=PATH     ],[where to find the themes (don't change)])
-
-TUXBOX_APPS_DIRECTORY_ONE(iconsdir,ICONSDIR,datadir,/share,/tuxbox/neutrino/icons,
-	[--with-iconsdir=PATH    ],[where to find the icons])
-
-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(public_httpddir,PUBLIC_HTTPDDIR,localstatedir,/var,/httpd,
-	[--with-public_httpddir=PATH    ],[where to find the the public httpd files])
-
-TUXBOX_APPS_DIRECTORY_ONE(hosted_httpddir,HOSTED_HTTPDDIR,mntdir,/mnt,/hosted,
-	[--with-hosted_httpddir=PATH     ],[where to find the the hosted files])
 ])
 
 dnl automake <= 1.6 needs this specifications
@@ -182,15 +139,9 @@ AC_SUBST(DATADIR)
 AC_SUBST(FONTDIR)
 AC_SUBST(GAMESDIR)
 AC_SUBST(LIBDIR)
-AC_SUBST(MNTDIR)
 AC_SUBST(PLUGINDIR)
-AC_SUBST(LUAPLUGINDIR)
+AC_SUBST(UCODEDIR)
-AC_SUBST(LOCALEDIR)
 AC_SUBST(THEMESDIR)
-AC_SUBST(ICONSDIR)
-AC_SUBST(PRIVATE_HTTPDDIR)
-AC_SUBST(PUBLIC_HTTPDDIR)
-AC_SUBST(HOSTED_HTTPDDIR)
 dnl end workaround
 
 AC_DEFUN([TUXBOX_APPS_ENDIAN],[
@@ -220,11 +171,15 @@ AC_ARG_WITH(dvbincludes,
 	[DVBINCLUDES="$withval"],[DVBINCLUDES=""])
 
 if test "$DVBINCLUDES"; then
-	CPPFLAGS="-I$DVBINCLUDES $CPPFLAGS"
+	CPPFLAGS="$CPPFLAGS -I$DVBINCLUDES"
-	CFLAGS="-I$DVBINCLUDES $CFLAGS"
-	CXXFLAGS="-I$DVBINCLUDES $CXXFLAGS"
 fi
 
+AC_CHECK_HEADERS(ost/dmx.h,[
+	DVB_API_VERSION=1
+	AC_MSG_NOTICE([found dvb version 1])
+])
+
+if test -z "$DVB_API_VERSION"; then
 AC_CHECK_HEADERS(linux/dvb/version.h,[
 	AC_LANG_PREPROC_REQUIRE()
 	AC_REQUIRE([AC_PROG_EGREP])
@@ -232,17 +187,12 @@ AC_CHECK_HEADERS(linux/dvb/version.h,[
 #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\ ,,"`
+	DVB_API_VERSION=`(eval "$ac_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD | $EGREP "^version" | sed "s,version\ ,,"`
-
-	AC_LANG_CONFTEST([AC_LANG_SOURCE([[
-#include <linux/dvb/version.h>
-version DVB_API_VERSION_MINOR
-	]])])
-	DVB_API_VERSION_MINOR=`(eval "$ac_cpp -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])
+	AC_MSG_NOTICE([found dvb version $DVB_API_VERSION])
 ])
+fi
 
 if test "$DVB_API_VERSION"; then
 	AC_DEFINE(HAVE_DVB,1,[Define to 1 if you have the dvb includes])
@@ -250,12 +200,6 @@ if test "$DVB_API_VERSION"; then
 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],[
@@ -272,18 +216,18 @@ if test "$$1_CONFIG" != "no"; then
 	if test "$TARGET" = "cdk" && check_path "$$1_CONFIG"; then
 		AC_MSG_$3([could not find a suitable version of $2]);
 	else
-		if test "$1" = "CURL"; then
+                if test "$1" = "CURL"; then
-			$1_CFLAGS=$($$1_CONFIG --cflags)
+                	$1_CFLAGS=$($$1_CONFIG --cflags)
 			$1_LIBS=$($$1_CONFIG --libs)
 		else
-			if test "$1" = "FREETYPE"; then
+	    		if test "$1" = "FREETYPE"; then
-			$1_CFLAGS=$($$1_CONFIG --cflags)
+	            		$1_CFLAGS=$($$1_CONFIG --cflags)
-				$1_LIBS=$($$1_CONFIG --libs)
+	            		$1_LIBS=$($$1_CONFIG --libs)
-			else
+	    		else
-				$1_CFLAGS=$($$1_CONFIG --prefix=$TARGET_PREFIX --cflags)
+	            		$1_CFLAGS=$($$1_CONFIG --prefix=$targetprefix --cflags)
-				$1_LIBS=$($$1_CONFIG --prefix=$TARGET_PREFIX --libs)
+	            		$1_LIBS=$($$1_CONFIG --prefix=$targetprefix --libs)
 			fi
-		fi
+	        fi
 	fi
 fi
 
@@ -303,13 +247,8 @@ _TUXBOX_APPS_LIB_CONFIG($1,$2,WARN)
 ])
 
 AC_DEFUN([TUXBOX_APPS_PKGCONFIG],[
-m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+AC_PATH_PROG(PKG_CONFIG, pkg-config,no)
-m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
+if test "$PKG_CONFIG" = "no" ; then
-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
 ])
@@ -321,7 +260,6 @@ if $PKG_CONFIG --exists "$2" ; then
 	AC_MSG_RESULT(yes)
 	$1_CFLAGS=$($PKG_CONFIG --cflags "$2")
 	$1_LIBS=$($PKG_CONFIG --libs "$2")
-	$1_EXISTS=yes
 else
 	AC_MSG_RESULT(no)
 fi
@@ -332,7 +270,7 @@ AC_SUBST($1_LIBS)
 
 AC_DEFUN([TUXBOX_APPS_LIB_PKGCONFIG],[
 _TUXBOX_APPS_LIB_PKGCONFIG($1,$2)
-if test x"$$1_EXISTS" != xyes; then
+if test -z "$$1_CFLAGS" ; then
 	AC_MSG_ERROR([could not find package $2]);
 fi
 ])
@@ -446,9 +384,9 @@ AC_SUBST(CATALOGS)
 
 AC_DEFUN([TUXBOX_BOXTYPE],[
 AC_ARG_WITH(boxtype,
-	[  --with-boxtype          valid values: dbox2,tripledragon,dreambox,ipbox,coolstream,spark,azbox,generic],
+	[  --with-boxtype          valid values: dbox2,tripledragon,dreambox,ipbox,coolstream,generic],
 	[case "${withval}" in
-		dbox2|dreambox|ipbox|tripledragon|coolstream|spark|azbox|generic)
+		dbox2|dreambox|ipbox|tripledragon|coolstream|generic)
 			BOXTYPE="$withval"
 			;;
 		dm*)
@@ -460,17 +398,9 @@ AC_ARG_WITH(boxtype,
 	esac], [BOXTYPE="coolstream"])
 
 AC_ARG_WITH(boxmodel,
-	[  --with-boxmodel         valid for coolstream: nevis, apollo
+	[  --with-boxmodel         valid for dreambox: dm500, dm500plus, dm600pvr, dm56x0, dm7000, dm7020, dm7025
-                          valid for dreambox: dm500, dm500plus, dm600pvr, dm56x0, dm7000, dm7020, dm7025
                           valid for ipbox: ip200, ip250, ip350, ip400],
 	[case "${withval}" in
-		nevis|apollo)
-			if test "$BOXTYPE" = "coolstream"; then
-				BOXMODEL="$withval"
-			else
-				AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE])
-			fi
-			;;
 		dm500|dm500plus|dm600pvr|dm56x0|dm7000|dm7020|dm7025)
 			if test "$BOXTYPE" = "dreambox"; then
 				BOXMODEL="$withval"
@@ -485,17 +415,10 @@ 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])
 			;;
-	esac], [BOXMODEL="nevis"]
+	esac],
 	[if test "$BOXTYPE" = "dreambox" -o "$BOXTYPE" = "ipbox" && test -z "$BOXMODEL"; then
 		AC_MSG_ERROR([Dreambox/IPBox needs --with-boxmodel])
 	fi])
@@ -503,18 +426,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")
-AM_CONDITIONAL(BOXMODEL_APOLLO,test "$BOXMODEL" = "apollo")
-
 AM_CONDITIONAL(BOXMODEL_DM500,test "$BOXMODEL" = "dm500")
 AM_CONDITIONAL(BOXMODEL_DM500PLUS,test "$BOXMODEL" = "dm500plus")
 AM_CONDITIONAL(BOXMODEL_DM600PVR,test "$BOXMODEL" = "dm600pvr")
@@ -526,12 +444,8 @@ 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
@@ -540,18 +454,12 @@ elif test "$BOXTYPE" = "ipbox"; then
 	AC_DEFINE(HAVE_IPBOX_HARDWARE, 1, [building for an ipbox])
 elif test "$BOXTYPE" = "coolstream"; then
 	AC_DEFINE(HAVE_COOL_HARDWARE, 1, [building for a coolstream])
-elif test "$BOXTYPE" = "spark"; then
-	AC_DEFINE(HAVE_SPARK_HARDWARE, 1, [building for a goldenmedia 990 or edision pingulux])
 elif test "$BOXTYPE" = "generic"; then
 	AC_DEFINE(HAVE_GENERIC_HARDWARE, 1, [building for a generic device like a standard PC])
 fi
 
 # TODO: do we need more defines?
-if test "$BOXMODEL" = "nevis"; then
+if test "$BOXMODEL" = "dm500"; 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])
@@ -561,8 +469,6 @@ 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
 ])
 

autogen.sh

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

autorun.sh

@@ -1,19 +0,0 @@
-export LD_LIBRARY_PATH=/var/lib
-export PATH=${PATH}:/var/bin:/var/plugins
-
-echo "### Starting NEUTRINO ###"
-
-cd /tmp
-/bin/neutrino > /dev/null 2> /dev/null
-
-/bin/sync
-/bin/sync
-
-if [ -e /tmp/.reboot ] ; then
-    /bin/dt -t"Rebooting..."
-    /sbin/reboot -f
-else
-    /bin/dt -t"Panic..."
-    sleep 5
-    /sbin/reboot -f
-fi

configure.ac

@@ -3,7 +3,6 @@ AM_INIT_AUTOMAKE([1.0.1 nostdinc])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
 
 TUXBOX_APPS
-TUXBOX_APPS_DVB
 TUXBOX_APPS_DIRECTORY
 TUXBOX_APPS_PKGCONFIG
 TUXBOX_BOXTYPE
@@ -13,40 +12,6 @@ AC_PROG_CXX
 AC_DISABLE_STATIC
 AM_PROG_LIBTOOL
 
-# 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
-	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])
-
-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 x"$enable_ffmpegdec" != xyes; then
-
 AC_ARG_WITH([tremor], [AS_HELP_STRING([--with-tremor],
 	[use libvorbisidec instead of libogg/libvorbis])],
 	[TREMOR="$withval"],
@@ -57,6 +22,10 @@ AC_ARG_WITH([tremor-static], [AS_HELP_STRING([--with-tremor-static],
 	[TREMOR_STATIC="$withval"],
 	[TREMOR_STATIC=no])
 
+if test "$BOXTYPE" = "tripledragon"; then
+	TUXBOX_APPS_LIB_PKGCONFIG(DIRECTFB, directfb)
+fi
+
 if test "$TREMOR_STATIC" = "yes"; then
 	TREMOR=yes
 fi
@@ -71,59 +40,23 @@ if test "$TREMOR_STATIC" = "yes"; then
 	VORBISIDEC_LIBS="$(echo $VORBISIDEC_LIBS | sed 's@-L@@; s@ -l.*@/libvorbisidec.a@;')"
 fi
 
-TUXBOX_APPS_LIB_PKGCONFIG_CHECK(ID3TAG,libid3tag)
-if test x"$ID3TAG_EXISTS" != xyes; then
-	TUXBOX_APPS_LIB_PKGCONFIG(ID3TAG,id3tag)
-fi
-
-TUXBOX_APPS_LIB_PKGCONFIG_CHECK(MAD,libmad)
-if test x"$MAD_EXISTS" != xyes; then
-	TUXBOX_APPS_LIB_PKGCONFIG(MAD,mad)
-fi
-
-TUXBOX_APPS_LIB_PKGCONFIG_CHECK(OGG,ogg)
-if test -z "$OGG_CFLAGS" ; then
-	TUXBOX_APPS_LIB_PKGCONFIG(OGG,ogg)
-fi
-TUXBOX_APPS_LIB_PKGCONFIG(SWRESAMPLE,libswresample)
-else
-TUXBOX_APPS_LIB_PKGCONFIG(SWRESAMPLE,libswresample)
-fi
-
-if test "$BOXTYPE" = "tripledragon"; then
-	TUXBOX_APPS_LIB_PKGCONFIG(DIRECTFB, directfb)
-fi
-
 AM_CONDITIONAL(USE_TREMOR, test "$TREMOR" = "yes")
 
+TUXBOX_APPS_LIB_CONFIG(CURL,curl-config)
+TUXBOX_APPS_LIB_CONFIG(FREETYPE,freetype-config)
 # TUXBOX_APPS_LIB_PKGCONFIG(OPENSSL,openssl)
-TUXBOX_APPS_LIB_PKGCONFIG(CURL,libcurl)
+TUXBOX_APPS_LIB_PKGCONFIG_CHECK(ID3TAG,libid3tag)
-TUXBOX_APPS_LIB_PKGCONFIG(FREETYPE,freetype2)
+if test -z "$ID3TAG_CFLAGS" ; then
-# fallback to curl-config (which is ugly for cross-compilation)
+	TUXBOX_APPS_LIB_PKGCONFIG(ID3TAG,id3tag)
-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)
+TUXBOX_APPS_LIB_PKGCONFIG_CHECK(MAD,libmad)
-if test -z "$FREETYPE_LIBS" -a -z "$FREETYPE_CFLAGS"; then
+if test -z "$MAD_CFLAGS" ; then
-	TUXBOX_APPS_LIB_CONFIG(FREETYPE,freetype-config)
+	TUXBOX_APPS_LIB_PKGCONFIG(MAD,mad)
 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)
-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)
 #TUXBOX_APPS_LIB_PKGCONFIG(CONNECTION,tuxbox-connection)
 #TUXBOX_APPS_LIB_PKGCONFIG(EVENTSERVER,tuxbox-eventserver)
@@ -152,10 +85,6 @@ 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])
@@ -165,17 +94,6 @@ if test "$enable_giflib" = "yes"; then
 	AC_DEFINE(ENABLE_GIFLIB,1,[use giflib instead of libungif])
 fi
 
-### USE_PUGIXML
-AC_ARG_ENABLE(pugixml,
-       AS_HELP_STRING(--enable-pugixml,use pugixml instead of xmltree),
-       ,[enable_pugixml=no])
-
-AM_CONDITIONAL(USE_PUGIXML,test "$enable_pugixml" = "yes")
-if test "$enable_pugixml" = "yes"; then
-       AC_DEFINE(USE_PUGIXML,1,[use pugixml instead of xmltree])
-fi
-
-
 # FLAC - Free Lossless Audio Codec
 AC_ARG_ENABLE(flac,
 	AS_HELP_STRING(--enable-flac,include FLAC support),
@@ -196,102 +114,33 @@ 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(--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,
+AC_CHECK_HEADERS(coolstream/nevis_ir.h)
-	[  --enable-pip                  enable picture in picture support],
-	[AC_DEFINE(ENABLE_PIP,1,[enable picture in picture support])])
 
-
+#
-AC_ARG_ENABLE(testing,
+# Check for libtdservicedb - the new one - for testing only
-       AS_HELP_STRING(--enable-testing,include devel code parts for neutrino tests))
+#
-
+#CSL_VERSION=0.0.1
-AM_CONDITIONAL(ENABLE_TESTING,test "$enable_testing" = "yes")
+#FCSL_VERSION=`$PKG_CONFIG --modversion libcoolstream`
-if test "$enable_testing" = "yes"; then
+#AC_MSG_CHECKING(for package libcoolstream >= $CSL_VERSION)
-	AC_DEFINE(ENABLE_TESTING,1,[include devel code parts for neutrino tests - not recommended for general users!])
+#if $PKG_CONFIG --atleast-version $CSL_VERSION libcoolstream ; then
-fi
+      #AC_MSG_RESULT(found (version $FCSL_VERSION))
-
+      #LIBCS_CFLAGS=`$PKG_CONFIG --cflags libcoolstream`
-
+      #LIBCS_LIBS=`$PKG_CONFIG --libs libcoolstream`
-if test "$BOXTYPE" = "coolstream"; then
+#else
-if test -e ${srcdir}/lib/libcoolstream/nevis_ir.h; then
+      #AC_MSG_ERROR([
-	AC_DEFINE(HAVE_COOLSTREAM_NEVIS_IR_H,1,[Define to 1 if you have the <nevis_ir.h> header file.])
+#*** libcoolstream $CSL_VERSION or newer is required! ***
-fi
+  #])
-HWLIB_CFLAGS='-I$(top_srcdir)/lib/libcoolstream -I$(top_srcdir)/src/zapit/include/private'
+#fi
-
+AC_SUBST(LIBCS_CFLAGS)
-if test "$BOXMODEL" = "apollo"; then
+AC_SUBST(LIBCS_LIBS)
-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
-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__'
-else
-	HWLIB_CFLAGS="$HWLIB_CFLAGS "'-D__file__="\"$(subst $(srcdir)/,,$(abspath $<))\""'
-fi
-
-AC_SUBST(HWLIB_CFLAGS)
 AC_SUBST(FREETYPE_CFLAGS)
 AC_SUBST(FREETYPE_LIBS)
 AC_SUBST(VORBISIDEC_CFLAGS)
 AC_SUBST(VORBISIDEC_LIBS)
-AC_SUBST(STB_HAL_INC)
-AC_SUBST(STB_HAL_LIB)
-AC_SUBST(LUA_CFLAGS)
-AC_SUBST(LUA_LIBS)
-AC_SUBST(BLURAY_LIBS)
 
 AC_OUTPUT([
 Makefile
@@ -302,26 +151,22 @@ lib/libeventserver/Makefile
 lib/libmd5sum/Makefile
 lib/libnet/Makefile
 lib/xmltree/Makefile
-lib/jsoncpp/Makefile
 lib/sectionsdclient/Makefile
 lib/timerdclient/Makefile
-lib/libcoolstream/Makefile
+lib/libtriple/Makefile
 lib/libtuxtxt/Makefile
 lib/libdvbsub/Makefile
 lib/libupnpclient/Makefile
-lib/libiw/Makefile
-lib/luaclient/Makefile
 src/lcddisplay/Makefile
 src/nhttpd/Makefile
 src/nhttpd/web/Makefile
 src/nhttpd/web/images/Makefile
 src/nhttpd/web/scripts/Makefile
 src/nhttpd/web/languages/Makefile
-src/nhttpd/web/styles/Makefile
 src/nhttpd/tuxboxapi/Makefile
+src/nhttpd/tuxboxapi/coolstream/Makefile
 src/nhttpd/yhttpd_core/Makefile
 src/nhttpd/yhttpd_mods/Makefile
-src/nhttpd/nhttpd.conf
 src/Makefile
 src/daemonc/Makefile
 src/driver/pictureviewer/Makefile
@@ -329,24 +174,17 @@ src/driver/audiodec/Makefile
 src/driver/Makefile
 src/gui/Makefile
 src/gui/bedit/Makefile
-src/gui/components/Makefile
-src/gui/lua/Makefile
 src/gui/widget/Makefile
 src/system/Makefile
-src/system/mtdutils/Makefile
-src/system/mtdutils/lib/Makefile
 data/Makefile
 data/fonts/Makefile
 data/icons/Makefile
 data/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
@@ -354,5 +192,5 @@ src/timerd/Makefile
 src/zapit/Makefile
 src/zapit/lib/Makefile
 src/zapit/src/Makefile
-src/zapit/data/Makefile
 ])
+

cross-configure.apollo.debug

@@ -1,33 +0,0 @@
-#!/bin/sh
-
-PREFIX=/opt/arm/arm-pnx8400-linux-uclibcgnueabi/arm-pnx8400-linux-uclibcgnueabi/sys-root/usr
-CCPATH=
-HOST=arm-pnx8400-linux-uclibcgnueabi
-
-export PKG_CONFIG_PATH=${PREFIX}/lib/pkgconfig
-export CC=$CCPATH$HOST-gcc
-export AR=$CCPATH$HOST-ar
-export NM=$CCPATH$HOST-nm
-export RANLIB=$CCPATH$HOST-ranlib
-export OBJDUMP=$CCPATH$HOST-objdump
-export STRIP=$CCPATH$HOST-strip
-
-export CFLAGS="-Wall -Wextra -Wshadow -g -ggdb3 \
-	-mcpu=cortex-a9 -mfpu=vfpv3-d16 -mfloat-abi=hard \
-	 -D__KERNEL_STRICT_NAMES -DFB_HW_ACCELERATION \
-	-I"$PWD"/include -I"$PWD"/include/linux/dvb -I"$PREFIX"/include/freetype2"
-
-export CXXFLAGS="-Wall -Wextra -Wshadow -g -ggdb3 \
-	-mcpu=cortex-a9 -mfpu=vfpv3-d16 -mfloat-abi=hard \
-	 -D__KERNEL_STRICT_NAMES -DFB_HW_ACCELERATION \
-	-I"$PWD"/include -I"$PWD"/include/linux/dvb -I"$PREFIX"/include/freetype2"
-
-export LDFLAGS="-L"$PREFIX"/lib -lcurl -lssl -lcrypto -ldl"
-
-export DVB_API_VERSION=3
-export FREETYPE_CONFIG=$PREFIX/bin/freetype-config
-export CURL_CONFIG=$PREFIX/bin/curl-config
-
-./autogen.sh
-./configure --prefix=${PREFIX} --build=i386-pc-linux-gnu --host=$HOST --enable-flac --with-target=cdk --with-targetprefix="" --with-boxmodel=apollo --enable-mdev --enable-pip --enable-ffmpegdec --enable-lua "$@"
-

cross-configure.cool

@@ -27,5 +27,5 @@ export FREETYPE_CONFIG=$PREFIX/bin/freetype-config
 export CURL_CONFIG=$PREFIX/bin/curl-config
 
 ./autogen.sh
-./configure --prefix=${PREFIX} --build=i386-pc-linux-gnu --host=$HOST --enable-flac --with-target=cdk --with-targetprefix="" "$*"
+./configure --prefix=${PREFIX} --build=i386-pc-linux-gnu --host=$HOST --without-driver --with-target=cdk --with-targetprefix="" "$*"
 

cross-configure.cool.debug

@@ -27,5 +27,5 @@ export FREETYPE_CONFIG=$PREFIX/bin/freetype-config
 export CURL_CONFIG=$PREFIX/bin/curl-config
 
 ./autogen.sh
-./configure --prefix=${PREFIX} --build=i386-pc-linux-gnu --host=$HOST --enable-flac --with-target=cdk --with-targetprefix="" "$*"
+./configure --prefix=${PREFIX} --build=i386-pc-linux-gnu --host=$HOST --without-driver --with-target=cdk --with-targetprefix="" "$*"
 

data/Makefile.am

@@ -1,11 +1,8 @@
-SUBDIRS = fonts icons inetradio initial iso-codes license locale scripts themes neutrino-scripts
+SUBDIRS = fonts icons inetradio iso-codes locale scripts themes
 
 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
+config_DATA = cables.xml satellites.xml encoding.conf tobackup.conf providermap.xml
-
-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/cables.xml

@@ -25,7 +25,6 @@
 		<transponder frequency="490000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="522000" 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"/>
@@ -221,21 +220,16 @@
 	</cable>
 	<cable name="Unitymedia" satfeed="true" flags="9">
 		<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"/>
-		<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="354000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="362000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="362000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="370000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="370000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="378000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="378000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="386000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="386000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
 		<transponder frequency="394000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="396000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
 		<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"/>
@@ -253,34 +247,24 @@
 		<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="650000" 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"/>
+		<transponder frequency="722000" 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="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="3"/>
-		<transponder frequency="810000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="818000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="826000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="834000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
 	</cable>
 	<cable name="Kabel BW" satfeed="true" flags="9">
-		<transponder frequency="114000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="113000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="122000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="121000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
 		<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"/>
@@ -297,15 +281,22 @@
 		<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="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"/>
+		<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="3"/>
+		<transponder frequency="706000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<transponder frequency="714000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<transponder frequency="722000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<transponder frequency="730000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<transponder frequency="738000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
+		<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"/>
@@ -313,10 +304,6 @@
 		<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"/>
@@ -495,11 +482,11 @@
 		<transponder frequency="322000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="330000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="338000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="346000" symbol_rate="6875000" fec_inner="0" modulation="5"/>
+		<transponder frequency="346000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
-		<transponder frequency="354000" symbol_rate="6875000" fec_inner="0" modulation="5"/>
+		<transponder frequency="354000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
-		<transponder frequency="362000" symbol_rate="6875000" fec_inner="0" modulation="5"/>
+		<transponder frequency="362000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
-		<transponder frequency="370000" symbol_rate="6875000" fec_inner="0" modulation="5"/>
+		<transponder frequency="370000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
-		<transponder frequency="378000" symbol_rate="6875000" fec_inner="0" modulation="5"/>
+		<transponder frequency="378000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
 		<transponder frequency="386000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
 		<transponder frequency="394000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
 		<transponder frequency="402000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
@@ -511,7 +498,7 @@
 		<transponder frequency="450000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
 		<transponder frequency="458000" symbol_rate="6111000" fec_inner="0" modulation="3"/>
 		<transponder frequency="466000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
-		<transponder frequency="474000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="474000" symbol_rate="6900000" 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"/>
@@ -519,84 +506,8 @@
 		<transponder frequency="514000" symbol_rate="6111000" fec_inner="0" modulation="3"/>
 		<transponder frequency="522000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
 		<transponder frequency="530000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="538000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="538000" symbol_rate="6790000" fec_inner="0" modulation="3"/>
-		<transponder frequency="546000" symbol_rate="6110000" fec_inner="0" modulation="3"/>
+		<transponder frequency="540000" 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="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="618000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-	</cable>
-	<cable name="Antennengemeinschaft Penig" satfeed="true" flags="9">
-		<transponder frequency="129000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<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="6875000" fec_inner="0" modulation="3"/>
-		<transponder frequency="330000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
-		<transponder frequency="328000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
-		<transponder frequency="346000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
-		<transponder frequency="354000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
-		<transponder frequency="362000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
-		<transponder frequency="370000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
-		<transponder frequency="378000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
-		<transponder frequency="386000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
-		<transponder frequency="394000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
-		<transponder frequency="402000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="410000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
-		<transponder frequency="418000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="426000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="434000" symbol_rate="6875000" fec_inner="0" modulation="5"/>
-		<transponder frequency="442000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
-		<transponder frequency="450000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="466000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
-		<transponder frequency="506000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="514000" 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"/>
-	</cable>
-	<cable name="Antennenverein Hohenmoelsen" 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"/>
-		<transponder frequency="138000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="146000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="178000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="186000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="194000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="202000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="210000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="218000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="226000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="234000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="242000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="250000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="258000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="266000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="274000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="282000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="290000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="298000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="306000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="314000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="322000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="330000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="338000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="346000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="354000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-		<transponder frequency="362000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="370000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="378000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="386000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="394000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="402000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="410000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="418000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="426000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="434000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="442000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="450000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 	</cable>
 	<cable name="M-net" satfeed="true" flags="9">
 		<transponder frequency="114000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
@@ -1426,9 +1337,6 @@
 		<transponder frequency="530000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="538000" 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"/>
 	</cable>
 	<cable name="CST Berlin" satfeed="true" flags="9">
 		<transponder frequency="306000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
@@ -1449,28 +1357,4 @@
 	<cable name="Ziggo Groningen" satfeed="true" flags="9" nid="9700">
 		<transponder frequency="369000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
 	</cable>
-	<cable name="Ziggo noord-holland" satfeed="true" flags="9" nid="8888">
-		<transponder frequency="514000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
-	</cable>
-	<cable name="Ziggo Zuid-holland" satfeed="true" flags="9" nid="5555">
-		<transponder frequency="372000" symbol_rate="6875000" fec_inner="0" modulation="3"/>
-	</cable>
-	<cable name="Upc Brabant" satfeed="true" flags="9" nid="43144">
-		<transponder frequency="164000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-	</cable>
-	<cable name="Upc Flevoland" satfeed="true" flags="9" nid="43138">
-		<transponder frequency="164000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-	</cable>
-	<cable name="Upc Friesland" satfeed="true" flags="9" nid="43140">
-		<transponder frequency="164000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-	</cable>
-	<cable name="Upc Gelderland" satfeed="true" flags="9" nid="43142">
-		<transponder frequency="164000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-	</cable>
-	<cable name="Upc Noord-Holland" satfeed="true" flags="9" nid="43136">
-		<transponder frequency="164000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-	</cable>
-	<cable name="Upc Zuid-Holland" satfeed="true" flags="9" nid="43146">
-		<transponder frequency="164000" symbol_rate="6900000" fec_inner="0" modulation="3"/>
-	</cable>
 </cables>

data/encoding.conf

@@ -5,37 +5,28 @@ gre ISO8859-7
 pol ISO8859-2
 rus ISO8859-5
 bul ISO8859-5
-cn ISO3166-2
+cn  ISO3166-2 
 #Table of transponder using two byte char mappings (VideoTexSuppl)
 #TSID ONID
 0x441 0x1 ISO6937 # RTL
 0x443 0x1 ISO6937 # Eurosport / RTL Austria 
 #
-#0x447 0x1 #ASTRA 19.2<EFBFBD> UPC Direct
+0x447 0x1 #ASTRA 19.2<EFBFBD> UPC Direct
-#0x427 0x1 #ASTRA 19.2<EFBFBD> UPC Direct
+0x427 0x1 #ASTRA 19.2<EFBFBD> UPC Direct
-#0x44b 0x1 #ASTRA 19.2<EFBFBD> UPC Direct
+0x44b 0x1 #ASTRA 19.2<EFBFBD> UPC Direct
-#0x4ff 0x1 #ASTRA 19.2<EFBFBD> UPC Direct
+0x4ff 0x1 #ASTRA 19.2<EFBFBD> UPC Direct
-#0x407 0x1 #ASTRA 19.2<EFBFBD> UPC Direct
+0x407 0x1 #ASTRA 19.2<EFBFBD> UPC Direct
-#0x436 0x1 #ASTRA 19.2<EFBFBD> MTV Euro - MTV Networks
+0x436 0x1 #ASTRA 19.2<EFBFBD> MTV Euro - MTV Networks
-#0x42a 0x1 #ASTRA 19.2<EFBFBD> VH1 Classic - MTV Networks
+0x42a 0x1 #ASTRA 19.2<EFBFBD> VH1 Classic - MTV Networks
-#
+0xc23 0x3 #ASTRA 23.5<EFBFBD> CzechLink
-#0xc23 0x3 #ASTRA 23.5<EFBFBD> CzechLink 10803H
+0xc93 0x3 #ASTRA 23.5<EFBFBD> CzechLink
-#0xbc7 0x3 #ASTRA 23.5<EFBFBD> CzechLink 12565H
+0xc95 0x3 #ASTRA 23.5<EFBFBD> CzechLink
-#0xc8b 0x3 #ASTRA 23.5<EFBFBD> CzechLink 11914H
+0xc8b 0x3 #ASTRA 23.5<EFBFBD> CzechLink
-#0xc8f 0x3 #ASTRA 23.5<EFBFBD> CzechLink 11992H
+0xc89 0x3 #ASTRA 23.5<EFBFBD> CzechLink
-0xbc6 0x3 #ASTRA 23.5<EFBFBD> 12525V skylink
+0xbc7 0x3 #ASTRA 23.5<EFBFBD> CzechLink
-0xc85 0x3 #ASTRA 23.5<EFBFBD> 11797H skylink
+0xc8f 0x3 #ASTRA 23.5<EFBFBD> CzechLink
-0xc87 0x3 #ASTRA 23.5<EFBFBD> 11836H skylink*
+0xc85 0x3 #ASTRA 23.5<EFBFBD> CzechLink
-0xc88 0x3 #ASTRA 23.5<EFBFBD> 11856V skylink*
+0xbc6 0x3 #ASTRA 23.5<EFBFBD> CzechLink
-0xc89 0x3 #ASTRA 23.5<EFBFBD> 11876H skylink
-0xc8a 0x3 #ASTRA 23.5<EFBFBD> 11895V skylink
-0xc8c 0x3 #ASTRA 23.5<EFBFBD> 11934V skylink*
-0xc8e 0x3 #ASTRA 23.5<EFBFBD> 11973V skylink*
-0xc93 0x3 #ASTRA 23.5<EFBFBD> 12070H skylink
-0xc95 0x3 #ASTRA 23.5<EFBFBD> 12109H skylink
-0xc98 0x3 #ASTRA 23.5<EFBFBD> 12168V skylink*
-0xc9a 0x3 #ASTRA 23.5<EFBFBD> 12207V skylink*
-0xc8b 0x3 ISO6397 # skylink 23.5<EFBFBD>E 11914 H 
 #TSID ONID
 0x1 0x601 #UPC Cable Hungary
 0x2 0x601 #UPC Cable Hungary
@@ -52,38 +43,22 @@ cn ISO3166-2
 0xd 0x601 #UPC Cable Hungary
 0xe 0x601 #UPC Cable Hungary
 0xf 0x601 #UPC Cable Hungary
-# freesat
+# UPC Direct Thor 1.0W
-0x2bd 0x600 # freesat 0.8<EFBFBD>W 11727 V
+0x2b2 0x600
-0x2be 0x600 # freesat 0.8<EFBFBD>W 11766 V
+0x2bd 0x600
-0x2bf 0x600 # freesat 0.8<EFBFBD>W 11804 V
+0x2be 0x600
-0x2c0 0x600 # freesat 0.8<EFBFBD>W 11996 V
+0x2bf 0x600
-0x2c1 0x600 # freesat 0.8<EFBFBD>W 12034 V
+0x2c0 0x600
-0x2c2 0x600 # freesat 0.8<EFBFBD>W 12073 V
+0x2c1 0x600
-0x2c3 0x600 # freesat 0.8<EFBFBD>W 11938 H
+0x2c2 0x600
-0x2c4 0x600 # freesat 0.8<EFBFBD>W 12188 V
+0x2c3 0x600
-0x2c5 0x600 # freesat 0.8<EFBFBD>W 12265 V
+0x2c4 0x600
-0x2c6 0x600 # freesat 0.8<EFBFBD>W 11843 V
+0x2c5 0x600
-0x2c8 0x600 # freesat 0.8<EFBFBD>W 12111 V
+0x2c6 0x600
-0x26 0x46 # freesat 0.8<EFBFBD>W 11785 H
+0x2e 0x46
-0x29 0x46 # freesat 0.8<EFBFBD>W 12015 H
+0x1 0x1111
-0x1b 0x2c0 # freesat 0.8<EFBFBD>W 12226 V
+0x2 0x1111
-0x5 0x1111 # freesat 0.8<EFBFBD>W 11747 H
+0x3 0x1111
-0x7 0x1111 # freesat 0.8<EFBFBD>W 11976 H
-0x65 0x1771 # freesat 0.8<EFBFBD>W 12380 V
-# DigiTV
-0x1 0x1 ISO8859-2 # DigiTV 0.8<EFBFBD>W 12687 H
-0x2 0x1 ISO8859-2 # DigiTV 0.8<EFBFBD>W 12723 H
-0x3 0x1 ISO8859-2 # DigiTV 0.8<EFBFBD>W 12643 H
-0x4 0x1 ISO8859-2 # DigiTV 0.8<EFBFBD>W 12527 H
-0x5 0x1 ISO8859-2 # DigiTV 0.8<EFBFBD>W 12563 H
-0x6 0x1 ISO8859-2 # DigiTV 0.8<EFBFBD>W 12643 V
-0x7 0x1 ISO8859-2 # DigiTV 0.8<EFBFBD>W 12607 H
-0x8 0x1 ISO8859-2 # DigiTV 0.8<EFBFBD>W 12687 V
-0x9 0x1 ISO8859-2 # DigiTV 0.8<EFBFBD>W 12607 V
-0xa 0x1 ISO8859-2 # DigiTV 0.8<EFBFBD>W 12563 V
-0xb 0x1 ISO8859-2 # DigiTV 0.8<EFBFBD>W 12718 V
-0xc 0x1 ISO8859-2 # DigiTV 0.8<EFBFBD>W 11900 H
-# Cyfra+
 200 318 #Hotbird Eutelsat (Eurosport)
 300 318 #Hotbird Eutelsat (Eurosport, Animal Pl.HD)
 400 318 #Hotbird 13.0 Cyfra+
@@ -108,21 +83,13 @@ cn ISO3166-2
 13200 113 #Hotbird 13.0 Cyfrowy Polsat
 #Fallback encoding table for following transponders
 #TSID ONID ISO8859-X
-0x4fb0 0x7e ISO8859-9 # Digiturk 7<>E 10762 V
+#0x447 0x1 ISO8859-9
-0x5014 0x7e ISO8859-9 # Digiturk 7<>E 10803 H
+50100 126 ISO8859-9 # Digiturk 7<>E 11.471 V 30.000 3/4
-0x5078 0x7e ISO8859-9 # Digiturk 7<>E 10804 V
+50200 126 ISO8859-9 # Digiturk 7<>E 11.492 V 30.000 3/4
-0x5140 0x7e ISO8859-9 # Digiturk 7<>E 10845 V
+50300 126 ISO8859-9 # Digiturk 7<>E 11.639 H 30.000 3/4
-0x51a4 0x7e ISO8859-9 # Digiturk 7<>E 10886 H
+50400 126 ISO8859-9 # Digiturk 7<>E 11.534 V 30.000 3/4
-0x5208 0x7e ISO8859-9 # Digiturk 7<>E 10928 H
+50600 126 ISO8859-9 # Digiturk 7<>E 11.575 V and 42<34>E 11.729 V 15.555 5/6
-0x526c 0x7e ISO8859-9 # Digiturk 7<>E 10887 V
+50700 126 ISO8859-9 # Digiturk 7<>E 11.596 H 30.000 3/4
-0x52d0 0x7e ISO8859-9 # Digiturk 7<>E 10928 V
+50800 126 ISO8859-9 # Digiturk 7<>E 11.678 H 30.000 3/4
-0xa0f0 0x7e ISO8859-9 # Digiturk 7<>E 11455 V
+50900 126 ISO8859-9 # Digiturk 7<>E 11.513 H 27.500 3/4
-0xc3b4 0x7e ISO8859-9 # Digiturk 7<>E 11471 H
+51000 126 ISO8859-9 # Digiturk 7<>E 11.617 V 30.000 3/4
-0xc418 0x7e ISO8859-9 # Digiturk 7<>E 11492 V
-0xc47c 0x7e ISO8859-9 # Digiturk 7<>E 11637 H
-0xc4e0 0x7e ISO8859-9 # Digiturk 7<>E 11534 V
-0xc5a8 0x7e ISO8859-9 # Digiturk 7<>E 11575 V and 42<34>E 11729 V
-0xc60c 0x7e ISO8859-9 # Digiturk 7<>E 11595 H
-0xc670 0x7e ISO8859-9 # Digiturk 7<>E 11679 H
-0xc6d4 0x7e ISO8859-9 # Digiturk 7<>E 11513 H
-0xc738 0x7e ISO8859-9 # Digiturk 7<>E 11617 V

data/fonts/Makefile.am

@@ -10,7 +10,3 @@ install_DATA = \
 	DejaVuLGCSansMono-Bold.ttf \
 	tuxtxt.ttf \
 	tuxtxt.otb
-
-if BOXMODEL_APOLLO
-install_DATA += UnDotum.ttf
-endif

data/icons/Makefile.am

@@ -1,29 +1,6 @@
-installdir = $(ICONSDIR)
+installdir = $(DATADIR)/neutrino/icons
 
-locale = \
+install_DATA = \
-	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 \
@@ -39,7 +16,7 @@ install_DATA += \
 	ats.png \
 	ats_gray.png \
 	audio.png \
-	audioplay.png \
+	bayrisch.png \
 	biss_green.png \
 	biss_white.png \
 	biss_yellow.png \
@@ -47,17 +24,15 @@ install_DATA += \
 	bookmarkmanager.png \
 	border_lr.png \
 	border_ul.png \
-	btn_backward.png \
+	bosanski.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 \
+	ch-baslerdeutsch.png \
+	ch-berndeutsch.png \
 	colors.png \
 	conax_green.png \
 	conax_white.png \
@@ -65,27 +40,31 @@ install_DATA += \
 	cw_green.png \
 	cw_white.png \
 	cw_yellow.png \
+	czech.png \
 	d_green.png \
 	d_white.png \
 	d_yellow.png \
 	dd.png \
 	dd_avail.png \
 	dd_gray.png \
+	ddfill.png \
+	deutsch.png \
 	down.png \
-	dummy.png \
+	dutch.png \
-	dummy_small.png \
+	ellinika.png \
+	english.png \
 	error.png \
-	epg.png \
 	features.png \
 	file.png \
 	folder.png \
+	francais.png \
+	french.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 \
@@ -103,21 +82,17 @@ install_DATA += \
 	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 \
@@ -132,13 +107,12 @@ install_DATA += \
 	hint_tvradio_switch.png \
 	hint_vfd.png \
 	hint_video.png \
-	hint_ytplay.png \
 	home.png \
+	hungarian.png \
 	icon_green.png \
 	icon_movieplayer.png \
 	icon_red.png \
 	icon_yellow.png \
-	icon_ytplay.png \
 	important.png \
 	info.png \
 	info_small.png \
@@ -146,6 +120,7 @@ install_DATA += \
 	ird_green.png \
 	ird_white.png \
 	ird_yellow.png \
+	italiano.png \
 	keybinding.png \
 	language.png \
 	lcd.png \
@@ -162,8 +137,6 @@ install_DATA += \
 	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 \
@@ -174,7 +147,6 @@ install_DATA += \
 	mp3-5.jpg \
 	mp3-6.jpg \
 	mp3-7.jpg \
-	multimedia.png \
 	mute.png \
 	mute_small.png \
 	mute_zap_gray.png \
@@ -185,13 +157,16 @@ install_DATA += \
 	nds_green.png \
 	nds_white.png \
 	nds_yellow.png \
+	nederlands.png \
 	network.png \
+	norsk.png \
 	not_mounted.png \
 	notyet.png \
 	numericpad.png \
 	ok.png \
 	personalize.png \
-	pip.png \
+	polski.png \
+	portugues.png \
 	power.png \
 	powervu_green.png \
 	powervu_white.png \
@@ -212,7 +187,6 @@ install_DATA += \
 	radiotextget.png \
 	radiotextoff.png \
 	radiotextwait.png \
-	rclock.png \
 	rec.png \
 	rec_event_marker.png \
 	rec_gray.png \
@@ -234,7 +208,9 @@ install_DATA += \
 	res_hd.png \
 	res_sd.png \
 	right.png \
+	romania.png \
 	rot.png \
+	russkij.png \
 	scan.jpg \
 	seca_green.png \
 	seca_white.png \
@@ -242,16 +218,17 @@ install_DATA += \
 	settings.png \
 	shell.png \
 	shutdown.jpg \
+	slovak.png \
 	softupdate.png \
 	start.jpg \
 	streaming.png \
 	subt.png \
 	subt_gray.png \
+	suomi.png \
+	svenska.png \
 	timer.png \
 	tuner_1.png \
 	tuner_2.png \
-	tuner_3.png \
-	tuner_4.png \
 	up.png \
 	upnp.png \
 	via_green.png \
@@ -267,7 +244,6 @@ install_DATA += \
 	volumeslider2red.png \
 	vtxt.png \
 	vtxt_gray.png \
-	warning.png \
 	x_green.png \
 	x_white.png \
 	x_yellow.png \