Change to version 3.22.0

... to visualize update status already in the preview.

acinclude.m4

@@ -149,6 +149,13 @@ AC_ARG_WITH(default-theme,
 	[default_theme=""])
 AC_DEFINE_UNQUOTED([DEFAULT_THEME], ["$default_theme"], [Default theme for gui.])
 
+# default oled theme
+AC_ARG_WITH(default-oled-theme,
+	AS_HELP_STRING([--with-default-oled-theme=THEMENAME], [Default theme for oled. @<:@default is empty@:>@]),
+	[default_oled_theme="$withval"],
+	[default_oled_theme=""])
+AC_DEFINE_UNQUOTED([DEFAULT_OLED_THEME], ["$default_oled_theme"], [Default theme for oled.])
+
 AC_MSG_CHECKING(target)
 
 if test "$TARGET" = "native"; then
@@ -242,15 +249,15 @@ AC_REQUIRE([TUXBOX_APPS])
 
 if test "$TARGET" = "cdk"; then
 	datadir="\${prefix}/share"
-	sysconfdir="\${prefix}/etc"
-	localstatedir="\${prefix}/var"
+	sysconfdir="/etc"
+	localstatedir="/var"
 	libdir="\${prefix}/lib"
-	mntdir="\${prefix}/mnt"
+	mntdir="/mnt"
 	targetdatadir="\${TARGET_PREFIX}/share"
-	targetsysconfdir="\${TARGET_PREFIX}/etc"
-	targetlocalstatedir="\${TARGET_PREFIX}/var"
+	targetsysconfdir="/etc"
+	targetlocalstatedir="/var"
 	targetlibdir="\${TARGET_PREFIX}/lib"
-	targetmntdir="\${TARGET_PREFIX}/mnt"
+	targetmntdir="/mnt"
 else
 	mntdir="/mnt" # hack
 fi
@@ -258,9 +265,15 @@ fi
 TUXBOX_APPS_DIRECTORY_ONE(configdir, CONFIGDIR, localstatedir, /var, /tuxbox/config,
 	[--with-configdir=PATH], [where to find config files])
 
+TUXBOX_APPS_DIRECTORY_ONE(zapitdir, ZAPITDIR, localstatedir, /var, /tuxbox/config/zapit,
+	[--with-zapitdir=PATH], [where to find zapit files])
+
 TUXBOX_APPS_DIRECTORY_ONE(datadir, DATADIR, datadir, /share, /tuxbox,
 	[--with-datadir=PATH], [where to find data files])
 
+TUXBOX_APPS_DIRECTORY_ONE(datadir_var, DATADIR_VAR, localstatedir, /var, /tuxbox,
+	[--with-datadir_var=PATH], [where to find data files in /var])
+
 TUXBOX_APPS_DIRECTORY_ONE(controldir, CONTROLDIR, datadir, /share, /tuxbox/neutrino/control,
 	[--with-controldir=PATH], [where to find control scripts])
 
@@ -291,6 +304,9 @@ TUXBOX_APPS_DIRECTORY_ONE(plugindir_mnt, PLUGINDIR_MNT, mntdir, /mnt, /plugins,
 TUXBOX_APPS_DIRECTORY_ONE(luaplugindir, LUAPLUGINDIR, datadir, /share, /tuxbox/neutrino/luaplugins,
 	[--with-luaplugindir=PATH], [where to find Lua plugins])
 
+TUXBOX_APPS_DIRECTORY_ONE(luaplugindir_var, LUAPLUGINDIR_VAR, localstatedir, /var, /tuxbox/luaplugins,
+	[--with-luaplugindir_var=PATH], [where to find Lua plugins in /var])
+
 TUXBOX_APPS_DIRECTORY_ONE(webradiodir, WEBRADIODIR, datadir, /share, /tuxbox/neutrino/webradio,
 	[--with-webradiodir=PATH], [where to find webradio content])
 
@@ -327,6 +343,12 @@ TUXBOX_APPS_DIRECTORY_ONE(lcd4liconsdir, LCD4L_ICONSDIR, datadir, /share, /tuxbo
 TUXBOX_APPS_DIRECTORY_ONE(lcd4liconsdir_var, LCD4L_ICONSDIR_VAR, localstatedir, /var, /tuxbox/lcd/icons,
 	[--with-lcd4liconsdir_var=PATH], [where to find lcd4linux icons in /var])
 
+TUXBOX_APPS_DIRECTORY_ONE(logodir, LOGODIR, datadir, /share, /tuxbox/neutrino/icons/logo,
+	[--with-logodir=PATH], [where to find channel logos])
+
+TUXBOX_APPS_DIRECTORY_ONE(logodir_var, LOGODIR_VAR, localstatedir, /var, /tuxbox/icons/logo,
+	[--with-logodir_var=PATH], [where to find channel logos in /var])
+
 TUXBOX_APPS_DIRECTORY_ONE(private_httpddir, PRIVATE_HTTPDDIR, datadir, /share, /tuxbox/neutrino/httpd,
 	[--with-private_httpddir=PATH], [where to find private httpd files])
 
@@ -342,7 +364,9 @@ TUXBOX_APPS_DIRECTORY_ONE(flagdir, FLAGDIR, localstatedir, /var, /etc,
 
 dnl automake <= 1.6 needs this specifications
 AC_SUBST(CONFIGDIR)
+AC_SUBST(ZAPITDIR)
 AC_SUBST(DATADIR)
+AC_SUBST(DATADIR_VAR)
 AC_SUBST(CONTROLDIR)
 AC_SUBST(CONTROLDIR_VAR)
 AC_SUBST(FONTDIR)
@@ -354,6 +378,7 @@ AC_SUBST(PLUGINDIR)
 AC_SUBST(PLUGINDIR_VAR)
 AC_SUBST(PLUGINDIR_MNT)
 AC_SUBST(LUAPLUGINDIR)
+AC_SUBST(LUAPLUGINDIR_VAR)
 AC_SUBST(WEBRADIODIR)
 AC_SUBST(WEBRADIODIR_VAR)
 AC_SUBST(WEBTVDIR)
@@ -366,9 +391,12 @@ AC_SUBST(ICONSDIR)
 AC_SUBST(ICONSDIR_VAR)
 AC_SUBST(LCD4L_ICONSDIR)
 AC_SUBST(LCD4L_ICONSDIR_VAR)
+AC_SUBST(LOGODIR)
+AC_SUBST(LOGODIR_VAR)
 AC_SUBST(PRIVATE_HTTPDDIR)
 AC_SUBST(PUBLIC_HTTPDDIR)
 AC_SUBST(HOSTED_HTTPDDIR)
+AC_SUBST(FLAGDIR)
 dnl end workaround
 
 AC_DEFUN([_TUXBOX_APPS_LIB_CONFIG], [
@@ -446,9 +474,9 @@ _TUXBOX_APPS_LIB_PKGCONFIG($1,$2)
 
 AC_DEFUN([TUXBOX_BOXTYPE], [
 AC_ARG_WITH(boxtype,
-	AS_HELP_STRING([--with-boxtype], [valid values: generic, azbox, tripledragon, spark, coolstream, armbox, mipsbox]),
+	AS_HELP_STRING([--with-boxtype], [valid values: generic, coolstream, armbox, mipsbox]),
 	[case "${withval}" in
-		generic|azbox|tripledragon|spark|coolstream|armbox|mipsbox)
+		generic|coolstream|armbox|mipsbox)
 			BOXTYPE="$withval"
 		;;
 		*)
@@ -460,8 +488,8 @@ AC_ARG_WITH(boxtype,
 AC_ARG_WITH(boxmodel,
 	AS_HELP_STRING([--with-boxmodel], [valid for generic: generic, raspi])
 AS_HELP_STRING([], [valid for coolstream: hd1, hd2])
-AS_HELP_STRING([], [valid for armbox: hd51, hd60, bre2ze4k, h7, vusolo4k, vuduo4k, vuultimo4k, vuuno4k, vuuno4kse, vuzero4k, osmio4kplus])
-AS_HELP_STRING([], [valid for mipsbox: vuduo]),
+AS_HELP_STRING([], [valid for armbox: hd60, hd61, multiboxse, hd51, bre2ze4k, h7, osmini4k, osmio4k, osmio4kplus, vusolo4k, vuduo4k, vuduo4kse, vuultimo4k, vuuno4k, vuuno4kse, vuzero4k])
+AS_HELP_STRING([], [valid for mipsbox: vuduo, vuduo2]),
 	[case "${withval}" in
 		generic|raspi)
 			if test "$BOXTYPE" = "generic"; then
@@ -489,14 +517,14 @@ AS_HELP_STRING([], [valid for mipsbox: vuduo]),
 				AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE])
 			fi
 		;;
-		hd51|hd60|bre2ze4k|h7|vusolo4k|vuduo4k|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k|osmio4kplus)
+		hd60|hd61|multiboxse|hd51|bre2ze4k|h7|osmini4k|osmio4k|osmio4kplus|vusolo4k|vuduo4k|vuduo4kse|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k)
 			if test "$BOXTYPE" = "armbox"; then
 				BOXMODEL="$withval"
 			else
 				AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE])
 			fi
 		;;
-		vuduo)
+		vuduo|vuduo2|gb800se|osnino|osninoplus|osninopro)
 			if test "$BOXTYPE" = "mipsbox"; then
 				BOXMODEL="$withval"
 			else
@@ -513,10 +541,7 @@ AC_SUBST(BOXTYPE)
 AC_SUBST(BOXMODEL)
 
 AM_CONDITIONAL(BOXTYPE_GENERIC, test "$BOXTYPE" = "generic")
-AM_CONDITIONAL(BOXTYPE_AZBOX, test "$BOXTYPE" = "azbox")
-AM_CONDITIONAL(BOXTYPE_TRIPLE, test "$BOXTYPE" = "tripledragon")
-AM_CONDITIONAL(BOXTYPE_SPARK, test "$BOXTYPE" = "spark")
-AM_CONDITIONAL(BOXTYPE_COOL, test "$BOXTYPE" = "coolstream")
+AM_CONDITIONAL(BOXTYPE_CST, test "$BOXTYPE" = "coolstream")
 AM_CONDITIONAL(BOXTYPE_ARMBOX, test "$BOXTYPE" = "armbox")
 AM_CONDITIONAL(BOXTYPE_MIPSBOX, test "$BOXTYPE" = "mipsbox")
 
@@ -525,18 +550,25 @@ AM_CONDITIONAL(BOXMODEL_GENERIC, test "$BOXMODEL" = "generic")
 AM_CONDITIONAL(BOXMODEL_RASPI, test "$BOXMODEL" = "raspi")
 
 # coolstream
-AM_CONDITIONAL(BOXMODEL_CS_HD1, test "$BOXMODEL" = "hd1")
-AM_CONDITIONAL(BOXMODEL_CS_HD2, test "$BOXMODEL" = "hd2")
+AM_CONDITIONAL(BOXMODEL_CST_HD1, test "$BOXMODEL" = "hd1")
+AM_CONDITIONAL(BOXMODEL_CST_HD2, test "$BOXMODEL" = "hd2")
 
 # armbox
-AM_CONDITIONAL(BOXMODEL_HD51, test "$BOXMODEL" = "hd51")
 AM_CONDITIONAL(BOXMODEL_HD60, test "$BOXMODEL" = "hd60")
+AM_CONDITIONAL(BOXMODEL_HD61, test "$BOXMODEL" = "hd61")
+AM_CONDITIONAL(BOXMODEL_MULTIBOXSE, test "$BOXMODEL" = "multiboxse")
+
+AM_CONDITIONAL(BOXMODEL_HD51, test "$BOXMODEL" = "hd51")
 AM_CONDITIONAL(BOXMODEL_BRE2ZE4K, test "$BOXMODEL" = "bre2ze4k")
 AM_CONDITIONAL(BOXMODEL_H7, test "$BOXMODEL" = "h7")
+
+AM_CONDITIONAL(BOXMODEL_OSMINI4K, test "$BOXMODEL" = "osmini4k")
 AM_CONDITIONAL(BOXMODEL_OSMIO4K, test "$BOXMODEL" = "osmio4k")
 AM_CONDITIONAL(BOXMODEL_OSMIO4KPLUS, test "$BOXMODEL" = "osmio4kplus")
+
 AM_CONDITIONAL(BOXMODEL_VUSOLO4K, test "$BOXMODEL" = "vusolo4k")
 AM_CONDITIONAL(BOXMODEL_VUDUO4K, test "$BOXMODEL" = "vuduo4k")
+AM_CONDITIONAL(BOXMODEL_VUDUO4KSE, test "$BOXMODEL" = "vuduo4kse")
 AM_CONDITIONAL(BOXMODEL_VUULTIMO4K, test "$BOXMODEL" = "vuultimo4k")
 AM_CONDITIONAL(BOXMODEL_VUUNO4K, test "$BOXMODEL" = "vuuno4k")
 AM_CONDITIONAL(BOXMODEL_VUUNO4KSE, test "$BOXMODEL" = "vuuno4kse")
@@ -544,17 +576,18 @@ AM_CONDITIONAL(BOXMODEL_VUZERO4K, test "$BOXMODEL" = "vuzero4k")
 
 # mipsbox
 AM_CONDITIONAL(BOXMODEL_VUDUO, test "$BOXMODEL" = "vuduo")
+AM_CONDITIONAL(BOXMODEL_VUDUO2, test "$BOXMODEL" = "vuduo2")
+
+AM_CONDITIONAL(BOXMODEL_GB800SE, test "$BOXMODEL" = "gb800se")
+
+AM_CONDITIONAL(BOXMODEL_OSNINO, test "$BOXMODEL" = "osnino")
+AM_CONDITIONAL(BOXMODEL_OSNINOPLUS, test "$BOXMODEL" = "osninoplus")
+AM_CONDITIONAL(BOXMODEL_OSNINOPRO, test "$BOXMODEL" = "osninopro")
 
 if test "$BOXTYPE" = "generic"; then
 	AC_DEFINE(HAVE_GENERIC_HARDWARE, 1, [building for a generic device like a standard PC])
-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" = "spark"; then
-	AC_DEFINE(HAVE_SPARK_HARDWARE, 1, [building for a goldenmedia 990 or edision pingulux])
 elif test "$BOXTYPE" = "coolstream"; then
-	AC_DEFINE(HAVE_COOL_HARDWARE, 1, [building for a coolstream])
+	AC_DEFINE(HAVE_CST_HARDWARE, 1, [building for a coolstream])
 elif test "$BOXTYPE" = "armbox"; then
 	AC_DEFINE(HAVE_ARM_HARDWARE, 1, [building for an armbox])
 elif test "$BOXTYPE" = "mipsbox"; then
@@ -573,31 +606,46 @@ case "$BOXTYPE" in
 esac
 AM_CONDITIONAL(HAVE_LIBSTB_HAL, test "$libstb_hal" = "yes")
 
-# TODO: do we need more defines?
+# generic
 if test "$BOXMODEL" = "generic"; then
 	AC_DEFINE(BOXMODEL_GENERIC, 1, [generic pc])
 elif test "$BOXMODEL" = "raspi"; then
 	AC_DEFINE(BOXMODEL_RASPI, 1, [raspberry pi])
+
+# coolstream
 elif test "$BOXMODEL" = "hd1"; then
-	AC_DEFINE(BOXMODEL_CS_HD1, 1, [coolstream hd1/neo/neo2/zee])
+	AC_DEFINE(BOXMODEL_CST_HD1, 1, [coolstream hd1/neo/neo2/zee])
 elif test "$BOXMODEL" = "hd2"; then
-	AC_DEFINE(BOXMODEL_CS_HD2, 1, [coolstream tank/trinity/trinity v2/trinity duo/zee2/link])
-elif test "$BOXMODEL" = "hd51"; then
-	AC_DEFINE(BOXMODEL_HD51, 1, [hd51])
+	AC_DEFINE(BOXMODEL_CST_HD2, 1, [coolstream tank/trinity/trinity v2/trinity duo/zee2/link])
+
+# armbox
 elif test "$BOXMODEL" = "hd60"; then
 	AC_DEFINE(BOXMODEL_HD60, 1, [hd60])
+elif test "$BOXMODEL" = "hd61"; then
+	AC_DEFINE(BOXMODEL_HD61, 1, [hd61])
+elif test "$BOXMODEL" = "multiboxse"; then
+	AC_DEFINE(BOXMODEL_MULTIBOXSE, 1, [multiboxse])
+
+elif test "$BOXMODEL" = "hd51"; then
+	AC_DEFINE(BOXMODEL_HD51, 1, [hd51])
 elif test "$BOXMODEL" = "bre2ze4k"; then
 	AC_DEFINE(BOXMODEL_BRE2ZE4K, 1, [bre2ze4k])
 elif test "$BOXMODEL" = "h7"; then
 	AC_DEFINE(BOXMODEL_H7, 1, [h7])
+
+elif test "$BOXMODEL" = "osmini4k"; then
+        AC_DEFINE(BOXMODEL_OSMINI4K, 1, [osmini4k])
 elif test "$BOXMODEL" = "osmio4k"; then
         AC_DEFINE(BOXMODEL_OSMIO4K, 1, [osmio4k])
 elif test "$BOXMODEL" = "osmio4kplus"; then
         AC_DEFINE(BOXMODEL_OSMIO4KPLUS, 1, [osmio4kplus])
+
 elif test "$BOXMODEL" = "vusolo4k"; then
 	AC_DEFINE(BOXMODEL_VUSOLO4K, 1, [vusolo4k])
 elif test "$BOXMODEL" = "vuduo4k"; then
 	AC_DEFINE(BOXMODEL_VUDUO4K, 1, [vuduo4k])
+elif test "$BOXMODEL" = "vuduo4kse"; then
+	AC_DEFINE(BOXMODEL_VUDUO4KSE, 1, [vuduo4kse])
 elif test "$BOXMODEL" = "vuultimo4k"; then
 	AC_DEFINE(BOXMODEL_VUULTIMO4K, 1, [vuultimo4k])
 elif test "$BOXMODEL" = "vuuno4k"; then
@@ -606,52 +654,78 @@ elif test "$BOXMODEL" = "vuuno4kse"; then
 	AC_DEFINE(BOXMODEL_VUUNO4KSE, 1, [vuuno4kse])
 elif test "$BOXMODEL" = "vuzero4k"; then
 	AC_DEFINE(BOXMODEL_VUZERO4K, 1, [vuzero4k])
+
+# mipsbox
 elif test "$BOXMODEL" = "vuduo"; then
 	AC_DEFINE(BOXMODEL_VUDUO, 1, [vuduo])
+elif test "$BOXMODEL" = "vuduo2"; then
+	AC_DEFINE(BOXMODEL_VUDUO2, 1, [vuduo2])
+
+elif test "$BOXMODEL" = "gb800se"; then
+	AC_DEFINE(BOXMODEL_GB800SE, 1, [gb800se])
+
+elif test "$BOXMODEL" = "osnino"; then
+	AC_DEFINE(BOXMODEL_OSNINO, 1, [osnino])
+elif test "$BOXMODEL" = "osninoplus"; then
+	AC_DEFINE(BOXMODEL_OSNINOPLUS, 1, [osninoplus])
+elif test "$BOXMODEL" = "osninopro"; then
+	AC_DEFINE(BOXMODEL_OSNINOPRO, 1, [osninopro])
 fi
 
 # all vuplus BOXMODELs
 case "$BOXMODEL" in
-	vusolo4k|vuduo4k|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k|vuduo)
-		AC_DEFINE(BOXMODEL_VUPLUS, 1, [vuplus])
-		vuplus=true
+	vusolo4k|vuduo4k|vuduo4kse|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k|vuduo|vuduo2)
+		AC_DEFINE(BOXMODEL_VUPLUS_ALL, 1, [vuplus_all])
+		vuplus_all=true
 	;;
 	*)
-		vuplus=false
+		vuplus_all=false
 	;;
 esac
-AM_CONDITIONAL(BOXMODEL_VUPLUS, test "$vuplus" = "true")
+AM_CONDITIONAL(BOXMODEL_VUPLUS_ALL, test "$vuplus_all" = "true")
 
-# all vuplus4k BOXMODELs
+# all vuplus arm BOXMODELs
 case "$BOXMODEL" in
-	vusolo4k|vuduo4k|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k)
-		AC_DEFINE(BOXMODEL_VUPLUS4K, 1, [vuplus4k])
-		vuplus4k=true
+	vusolo4k|vuduo4k|vuduo4kse|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k)
+		AC_DEFINE(BOXMODEL_VUPLUS_ARM, 1, [vuplus_arm])
+		vuplus_arm=true
 	;;
 	*)
-		vuplus4k=false
+		vuplus_arm=false
 	;;
 esac
-AM_CONDITIONAL(BOXMODEL_VUPLUS4K, test "$vuplus4k" = "true")
+AM_CONDITIONAL(BOXMODEL_VUPLUS_ARM, test "$vuplus_arm" = "true")
+
+# all vuplus mips BOXMODELs
+case "$BOXMODEL" in
+	vuduo|vuduo2)
+		AC_DEFINE(BOXMODEL_VUPLUS_MIPS, 1, [vuplus_mips])
+		vuplus_mips=true
+	;;
+	*)
+		vuplus_mips=false
+	;;
+esac
+AM_CONDITIONAL(BOXMODEL_VUPLUS_MIPS, test "$vuplus_mips" = "true")
+
+# all hisilicon BOXMODELs
+case "$BOXMODEL" in
+	hd60|hd61|multiboxse)
+		AC_DEFINE(BOXMODEL_HISILICON, 1, [hisilicon])
+		hisilicon=true
+	;;
+	*)
+		hisilicon=false
+	;;
+esac
+AM_CONDITIONAL(BOXMODEL_HISILICON, test "$hisilicon" = "true")
 
 # BOXMODELs that allows to change osd resolution
 case "$BOXMODEL" in
-	hd2|hd51|hd60|bre2ze4k|h7|vusolo4k|vuduo4k|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k|vuduo|osmio4kplus)
+	hd2|hd60|hd61|multiboxse|hd51|bre2ze4k|h7|osmini4k|osmio4k|osmio4kplus|vusolo4k|vuduo4k|vuduo4kse|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k|vuduo|vuduo2|gb800se|osnino|osninoplus|osninopro)
 		AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION, 1, [enable to change osd resolution])
 	;;
 esac
-
-# BOXMODELs that needs GraphLCD support
-case "$BOXMODEL" in
-	vusolo4k|vuduo4k|vuultimo4k|vuuno4kse)
-		AC_DEFINE(ENABLE_GRAPHLCD, 1, [include GraphLCD support])
-		enable_graphlcd=yes
-	;;
-	*)
-		enable_graphlcd=no
-	;;
-esac
-AM_CONDITIONAL(ENABLE_GRAPHLCD, test "$enable_graphlcd" = "yes")
 ])
 
 dnl backward compatiblity

autorun.sh

@@ -1,19 +1,28 @@
 export LD_LIBRARY_PATH=/var/lib
 export PATH=${PATH}:/var/bin:/var/plugins
 
-echo "### Starting NEUTRINO ###"
+# Simple Neutrino start script
+
+# Neutrino's exit codes
+ERROR=-1
+NORMAL=0
+SHUTDOWN=1
+REBOOT=2
+
+echo "Starting Neutrino"
 
 cd /tmp
-/bin/neutrino > /dev/null 2> /dev/null
+/bin/neutrino >/dev/null 2>&1; RET=$?
+sync
 
-/bin/sync
-/bin/sync
+echo "Neutrino exited with exit code $RET"
 
-if [ -e /tmp/.reboot ] ; then
-    /bin/dt -t"Rebooting..."
-    /sbin/reboot -f
-else
-    /bin/dt -t"Panic..."
-    sleep 5
-    /sbin/reboot -f
+if [ $RET -eq $NORMAL ]; then
+	# do nothing
+elif [ $RET -eq $SHUTDOWN ]; then
+	poweroff
+elif [ $RET -eq $REBOOT ]; then
+	reboot
+else # $RET -eq $ERROR
+	reboot -f
 fi

configure.ac

@@ -1,19 +1,32 @@
 # explicit defines for separate revision handling
 define(ver_major, 3)
-define(ver_minor, 11)
-define(ver_micro, 1)
-define(neutrino_rel_cycle, ver_major.ver_minor)
+define(ver_minor, 22)
+define(ver_micro, 0)
+define(rel_cycle, "ver_major.0")
+
+# sync with current git
+define(ver_git, m4_esyscmd([
+	GITBRANCH=$(git rev-parse --abbrev-ref HEAD);
+	GITDESCRIBE=$(git describe --always --tags --dirty);
+	printf "$GITDESCRIBE $GITBRANCH"
+]))
+
+define(ver_date, m4_esyscmd([
+	BUILTDATE=$(date);
+	printf "$BUILTDATE"
+]))
 
 AC_INIT(Tuxbox-Neutrino,ver_major.ver_minor.ver_micro)
 AM_INIT_AUTOMAKE([nostdinc foreign])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
 
-AC_DEFINE(RELEASE_CYCLE, "2.5", [Release cycle information; used in update code; only relevant for flash image releases ])
+AC_DEFINE(PACKAGE_RELEASE_CYCLE, rel_cycle, [Release cycle information; used in update code; only relevant for flash image releases ])
 
 AC_DEFINE(PACKAGE_VERSION_MAJOR, ver_major, [Major version number])
 AC_DEFINE(PACKAGE_VERSION_MINOR, ver_minor, [Minor version number])
 AC_DEFINE(PACKAGE_VERSION_MICRO, ver_micro, [Micro version number])
-AC_DEFINE(PACKAGE_VERSION_NEUTRINO_REL_CYCLE, neutrino_rel_cycle, [Neutrino release cycle])
+AC_DEFINE(PACKAGE_VERSION_GIT, "ver_git", [internal vcs version info])
+AC_DEFINE(PACKAGE_VERSION_DATE, "ver_date", [internal built date])
 
 TUXBOX_APPS
 TUXBOX_APPS_DIRECTORY
@@ -100,10 +113,6 @@ TUXBOX_APPS_LIB_PKGCONFIG(SWRESAMPLE,libswresample)
 
 AM_CONDITIONAL(USE_TREMOR, test "$TREMOR" = "yes")
 
-if test "$BOXTYPE" = "tripledragon"; then
-	TUXBOX_APPS_LIB_PKGCONFIG(DIRECTFB, directfb)
-fi
-
 # TUXBOX_APPS_LIB_PKGCONFIG(OPENSSL,openssl)
 TUXBOX_APPS_LIB_PKGCONFIG(CURL,libcurl)
 
@@ -153,22 +162,22 @@ if test "$BOXTYPE" = "coolstream"; then
 	TUXBOX_APPS_LIB_PKGCONFIG(BLURAY,libbluray)
 fi
 
-if test "$BOXTYPE" = "coolstream" ||
+if test "$BOXTYPE" = "generic" ||
+   test "$BOXTYPE" = "coolstream" ||
    test "$BOXTYPE" = "armbox" ||
-   test "$BOXTYPE" = "mipsbox" ||
-   test "$BOXTYPE" = "generic" ||
-   test "$BOXTYPE" = "tripledragon" ||
-   test "$BOXTYPE" = "spark"; then
+   test "$BOXTYPE" = "mipsbox"; then
 	AC_DEFINE(SCREENSHOT, 1, [Define to 1 if the platform supports screenshots])
 fi
 
 AC_ARG_ENABLE(lcd4linux,
-	AS_HELP_STRING([--enable-lcd4linux], [enable Lcd4Linux support]),
-	,[enable_lcd4linux=no])
+	AS_HELP_STRING([--enable-lcd4linux], [enable LCD4Linux support @<:@default=no@:>@]),
+	AC_DEFINE(ENABLE_LCD4LINUX, 1, [enable LCD4Linux support]))
 AM_CONDITIONAL(ENABLE_LCD4LINUX, test "$enable_lcd4linux" = "yes")
-if test "$enable_lcd4linux" = "yes"; then
-	AC_DEFINE(ENABLE_LCD4LINUX, 1, [include Lcd4Linux support])
-fi
+
+AC_ARG_ENABLE(graphlcd,
+	AS_HELP_STRING([--enable-graphlcd], [enable GraphLCD support @<:@default=no@:>@]),
+	AC_DEFINE(ENABLE_GRAPHLCD, 1, [enable GraphLCD support]))
+AM_CONDITIONAL(ENABLE_GRAPHLCD, test "$enable_graphlcd" = "yes")
 
 AC_ARG_ENABLE(keyboard-no-rc,
 	AS_HELP_STRING([--enable-keyboard-no-rc], [enable keyboard control, disable rc control @<:@default=no@:>@]),
@@ -191,6 +200,16 @@ AC_ARG_ENABLE(fastscan,
 	AC_DEFINE(ENABLE_FASTSCAN, 1, [enable fastscan code]))
 AM_CONDITIONAL(ENABLE_FASTSCAN, test "$enable_fastscan" = "yes")
 
+AC_ARG_ENABLE(aitscan,
+	AS_HELP_STRING([--enable-aitscan], [enable Application Information Table support @<:@default=yes@:>@]),
+	[enable_aitscan="$enableval"],
+	[enable_aitscan="yes"])
+
+if test "$enable_aitscan" = "yes"; then
+	AC_DEFINE(ENABLE_AIT, 1, [enable Application Information Table support])
+fi
+AM_CONDITIONAL(ENABLE_AIT, test "$enable_aitscan" = "yes")
+
 AC_ARG_ENABLE(giflib,
 	AS_HELP_STRING([--enable-giflib], [use giflib instead of libungif @<:@default=no@:>@]),
 	AC_DEFINE(ENABLE_GIFLIB, 1, [use giflib instead of libungif]))
@@ -216,11 +235,36 @@ if test "$enable_upnp" = "yes"; then
 fi
 AM_CONDITIONAL(ENABLE_UPNP, test "$enable_upnp" = "yes")
 
+AC_ARG_ENABLE(arm-acc,
+	AS_HELP_STRING([--enable-arm-acc], [enable arm hardware acceleration @<:@default=yes@:>@]]),
+	[enable_arm_acc="$enableval"],
+	[enable_arm_acc="yes"])
+
+if test "$enable_arm_acc" = "yes"; then
+	AC_DEFINE(ENABLE_ARM_ACC, 1, [enable arm hardware acceleration])
+fi
+AM_CONDITIONAL(ENABLE_ARM_ACC, test "$enable_arm_acc" = "yes")
+
+AC_ARG_ENABLE(mips-acc,
+	AS_HELP_STRING([--enable-mips-acc], [enable mips hardware acceleration @<:@default=yes@:>@]]),
+	[enable_mips_acc="$enableval"],
+	[enable_mips_acc="yes"])
+
+if test "$enable_mips_acc" = "yes"; then
+	AC_DEFINE(ENABLE_MIPS_ACC, 1, [enable mips hardware acceleration])
+fi
+AM_CONDITIONAL(ENABLE_MIPS_ACC, test "$enable_mips_acc" = "yes")
+
 AC_ARG_ENABLE(extupdate,
 	AS_HELP_STRING([--enable-extupdate], [enable extended update routine @<:@default=no@:>@]),
 	AC_DEFINE(ENABLE_EXTUPDATE, 1, [enable extended update routine]))
 AM_CONDITIONAL(ENABLE_EXTUPDATE, test "$enable_extupdate" = "yes")
 
+AC_ARG_ENABLE(pkg-management,
+	AS_HELP_STRING([--enable-pkg-management], [enable gui package management @<:@default=no@:>@]),
+	AC_DEFINE(ENABLE_PKG_MANAGEMENT, 1, [enable package management]))
+AM_CONDITIONAL(ENABLE_PKG_MANAGEMENT, test "$enable_pkg_management" = "yes")
+
 AC_ARG_ENABLE(lua,
 	AS_HELP_STRING([--enable-lua], [enable Lua support @<:@default=yes@:>@]),
 	[enable_lua="$enableval"],
@@ -228,19 +272,20 @@ AC_ARG_ENABLE(lua,
 
 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"
-		], [
+	PKG_CHECK_MODULES(LUA, lua, LLUA="yes", LLUA="no")
+	PKG_CHECK_MODULES(luajit, luajit, LLUAJIT="yes", LLUAJIT="no")
+		if test "x$LLUAJIT" = "xyes"; then
+			LUA_LIBS="-lluajit-5.1"
+			AC_DEFINE(LUA_COMPAT_5_2, 1, [needed for build with lua 5.1])
+		elif test "x$LLUA" = "xyes"; then
+			LUA_LIBS="-llua"
+			AC_DEFINE(LUA_COMPAT_5_2, 0, [needed for build with lua 5.1])
+		else
 			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+])
+			AC_DEFINE(LUA_COMPAT_5_2, 0, [needed for build with lua 5.1])
+		fi
 fi
 AM_CONDITIONAL(ENABLE_LUA, test "$enable_lua" = "yes")
 
@@ -251,6 +296,23 @@ AC_ARG_ENABLE(cleanup,
 AC_ARG_ENABLE(pip,
 	AS_HELP_STRING([--enable-pip], [enable picture in picture support @<:@default=no@:>@]),
 	AC_DEFINE(ENABLE_PIP, 1, [enable picture in picture support]))
+AM_CONDITIONAL(ENABLE_PIP, test "$enable_pip" = "yes")
+
+case "$BOXMODEL" in
+	vusolo4k|vuduo4k|vuduo4kse|vuultimo4k|vuuno4k|vuuno4kse)
+		AC_ARG_ENABLE(quadpip,
+			AS_HELP_STRING([--enable-quadpip], [enable quad picture in picture support @<:@default=no@:>@]),
+			AC_DEFINE(ENABLE_QUADPIP, 1, [enable quad picture in picture support]))
+
+		AS_IF(test "$enable_quadpip" = "yes" -a "$enable_pip" != "yes",
+			AC_MSG_ERROR([--enable-quadpip depends on --enable-pip]))
+	;;
+esac
+AM_CONDITIONAL(ENABLE_QUADPIP, test "$enable_quadpip" = "yes")
+
+AC_ARG_ENABLE(dynamicdemux,
+	AS_HELP_STRING([--enable-dynamicdemux], [enable dynamic demux @<:@default=no@:>@]),
+	AC_DEFINE(DYNAMIC_DEMUX, 1, [enable dynamic demux]))
 
 AC_ARG_ENABLE(testing,
 	AS_HELP_STRING([--enable-testing], [enable development code @<:@default=no@:>@]),
@@ -324,7 +386,9 @@ AC_SUBST(STB_HAL_LIB)
 AC_SUBST(LUA_CFLAGS)
 AC_SUBST(LUA_LIBS)
 AC_SUBST(BLURAY_LIBS)
+AC_SUBST(LIBCOOLSTREAM_STATIC_DIR)
 
+# Makefiles
 AC_CONFIG_FILES([
 Makefile
 data/Makefile
@@ -336,6 +400,7 @@ data/icons/buttons/Makefile
 data/icons/filetypes/Makefile
 data/icons/headers/Makefile
 data/icons/hints/Makefile
+data/icons/hourglass/Makefile
 data/icons/locale/Makefile
 data/icons/movieplayer/Makefile
 data/icons/radar/Makefile
@@ -355,12 +420,25 @@ data/lcd/clock/Makefile
 data/lcd/icons/Makefile
 data/license/Makefile
 data/locale/Makefile
+data/luaplugins/Makefile
+data/oled/Makefile
+data/oled/fonts/Makefile
+data/oled/icons/Makefile
+data/oled/icons/clock/Makefile
+data/oled/icons/weather/Makefile
+data/oled/themes/Makefile
+data/oled/themes/400x240/Makefile
+data/oled/themes/480x320/Makefile
+data/oled/themes/800x480/Makefile
 data/pictures/Makefile
 data/pictures/backgrounds/Makefile
 data/pictures/screensaver/Makefile
 data/policy/Makefile
 data/scripts/Makefile
 data/themes/Makefile
+data/themes/Grey-3.0/Makefile
+data/themes/Grey-3.0/icons/Makefile
+data/themes/Grey-3.0/icons/buttons/Makefile
 data/themes/Grey-Blue/Makefile
 data/themes/Grey-Blue/icons/Makefile
 data/themes/Grey-Blue/icons/buttons/Makefile
@@ -398,6 +476,7 @@ src/Makefile
 src/daemonc/Makefile
 src/driver/Makefile
 src/driver/audiodec/Makefile
+src/driver/glcd/Makefile
 src/driver/pictureviewer/Makefile
 src/eitd/Makefile
 src/gui/Makefile
@@ -407,9 +486,7 @@ src/gui/lua/Makefile
 src/gui/moviebrowser/Makefile
 src/gui/widget/Makefile
 src/gui/widget/yaft/Makefile
-src/lcddisplay/Makefile
 src/nhttpd/Makefile
-src/nhttpd/nhttpd.conf
 src/nhttpd/tuxboxapi/Makefile
 src/nhttpd/yhttpd_core/Makefile
 src/nhttpd/yhttpd_mods/Makefile
@@ -422,4 +499,45 @@ src/zapit/lib/Makefile
 src/zapit/src/Makefile
 ])
 
+# Webserver config
+AC_CONFIG_FILES([
+src/nhttpd/nhttpd.conf
+])
+
+## Migration script
+#AC_CONFIG_FILES([
+#data/control/migration.sh
+#])
+
+# Backup scripts
+AC_CONFIG_FILES([
+data/scripts/backup.sh
+data/scripts/restore.sh
+data/scripts/backup_flash.sh
+data/scripts/restore_flash.sh
+])
+
+# Backup configs
+AC_CONFIG_FILES([
+data/config/settingsupdate.conf
+data/config/tobackup.conf
+])
+
+# Themes
+#AC_CONFIG_FILES([
+#data/themes/Material_Blue-Grey.theme
+#])
+
+# Oled themes
+AC_CONFIG_FILES([
+data/oled/themes/400x240/Default.otheme
+data/oled/themes/480x320/Default.otheme
+data/oled/themes/480x320/Advanced.otheme
+data/oled/themes/480x320/Easy.otheme
+data/oled/themes/480x320/Medium.otheme
+data/oled/themes/480x320/Simple.otheme
+data/oled/themes/480x320/Weather.otheme
+data/oled/themes/800x480/Default.otheme
+])
+
 AC_OUTPUT

data/Makefile.am

@@ -17,6 +17,12 @@ SUBDIRS = \
 	y-web \
 	zapit
 
-if BOXTYPE_TRIPLE
-SUBDIRS += lcd
+if ENABLE_LUA
+SUBDIRS += \
+	luaplugins
+endif
+
+if ENABLE_GRAPHLCD
+SUBDIRS += \
+	oled
 endif

data/config/Makefile.am

@@ -1,3 +1,6 @@
+EXTRA_DIST = \
+	tobackup.conf tobackup.conf.in
+
 installdir = $(CONFIGDIR)
 
 install_DATA = \
@@ -7,6 +10,13 @@ install_DATA = \
 	epglanguages.conf \
 	providermap.xml \
 	satellites.xml \
-	settingsupdate.conf \
 	terrestrial.xml \
 	tobackup.conf
+
+if ENABLE_EXTUPDATE
+EXTRA_DIST += \
+	settingsupdate.conf settingsupdate.conf.in
+
+install_DATA += \
+	settingsupdate.conf
+endif

data/config/bad_package_pattern.list.sample

@@ -1,23 +1,29 @@
 ^locale-base-
 ^perl-module-
 acl
+alsa-utils-
 attr
 attr-
 autoconf
 autofs-
 alsa-server
 avahi
+base-files
 base-passwd-
 bash-
+bluez5-
+boost-
 bsd
 busybox-
 catchsegv
+coreutils-
 -charmap-
 cups
 db-
 -dbg$
 -dev$
 -doc$
+dvb-
 e2fsprogs-
 elfutils
 enca
@@ -32,12 +38,14 @@ gettext
 git-
 gitweb
 glibc-
+gstreamer1.0-
 initscripts-
 icu
 jpeg-tools
 kbd-
 kernel
 kmod-
+kodi-
 krb5
 ldd
 lib
@@ -58,6 +66,7 @@ ntp-
 openssh-
 openssl-
 opkg-
+os
 pam-
 pango
 pci
@@ -66,6 +75,7 @@ pcsc-lite-
 perl-
 pps
 -ptest$
+pulseaudio-
 python-
 python3-
 qemu

data/config/cables.xml

@@ -1324,22 +1324,6 @@
 		<transponder frequency="338000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="346000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="354000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="370000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="378000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="386000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="394000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="418000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="426000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="434000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="450000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="458000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="466000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="474000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="482000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="490000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="498000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="514000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="530000" 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"/>
@@ -1352,14 +1336,26 @@
 		<transponder frequency="626000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="634000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="642000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="658000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="666000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
-		<transponder frequency="674000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="682000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="690000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="698000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="706000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 		<transponder frequency="714000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<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="418000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="434000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="426000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="450000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="458000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="466000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="474000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="482000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="490000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="498000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="514000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
+		<transponder frequency="530000" symbol_rate="6900000" fec_inner="0" modulation="5"/>
 	</cable>
 	<cable name="Ziggo Groningen" satfeed="true" flags="9" nid="9700">
 		<transponder frequency="369000" symbol_rate="6875000" fec_inner="0" modulation="3"/>

data/config/epgmap.xml

@@ -1,22 +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
-
-	<filter channel_id="aa0004210001ef10" >RTL.de</filter> --RTL HD
-	<filter channel_id="b6ba3db8013e4224" >RedlightHD.ero</filter> --Redlight HD
-</zapit>

data/config/good_package_pattern.list.sample

@@ -0,0 +1,77 @@
+autofs$
+bash$
+bluez5$
+busybox$
+bzip2$
+ca-certificates$
+cifs-utils$
+curl$
+dosfstools$
+dvb-femon$
+e2fsprogs$
+e2fsprogs-resize2fs$
+etckeeper$
+exfat-utils$
+f2fs-tools$
+fbset$
+findutils$
+firmware$
+flash-script$
+fuse-exfat$
+glibc4
+gptfdisk$
+grep$
+gzip$
+hdparm$
+htop$
+ifupdown$
+image-config$
+imagemagick$
+kernel-module$
+kernel-modules$
+libswscale$
+libusb1$
+links$
+localedef$
+minidlna$
+nano$
+neutrino-lua-plugins$
+neutrino-mp$
+neutrino-plugins$
+nfs-utils$
+nfs-utils-client$
+ntfs-3g$
+ntfsprogs$
+ntpdate$
+ofgwrite$
+oh-my-zsh$
+openssh$
+openssl$
+opkg$
+parted$
+procps$
+proftpd$
+pulseaudio$
+pv$
+rpcbind$
+rsync$
+rt8188eu$
+rtl8192cu$
+rtl8192eu$
+samba$
+samsunglcd4linux$
+sed$
+systemd$
+tar$
+themes$
+tzdata$
+tzdata-europe$
+udev-extraconf$
+udpxy$
+usbutils$
+util-linux$
+webmin$
+wpa-supplicant$
+xupnpd$
+zip$
+zsh$

data/config/settingsupdate.conf.in

@@ -25,30 +25,63 @@
 ## vor der Sicherung aus dem neuen Image zu löschende Dateien/Verzeichnisse,
 ## gekennzeichnet durch ein vorangestelltes ~
 # z.B.
-# ~/share/tuxbox/neutrino/themes/Classic.theme
+# ~@THEMESDIR@/Classic.theme
 #---------------------------------------------------------------------------
 
 
 #-------------
 ## Sicherungen
 #-------------
+@CONFIGDIR@/tobackup.conf
+@CONFIGDIR@/settingsupdate.conf
+
+@CONFIGDIR@/cables.xml
+#
+#
+#@CONFIGDIR@/FritzCallMonitor.cfg
+@CONFIGDIR@/radio-favorites.xml
+@CONFIGDIR@/radio-stations.xml
+@CONFIGDIR@/timerd.conf
+@CONFIGDIR@/satellites.xml
+@CONFIGDIR@/tuxcal/
+@CONFIGDIR@/tuxmail/
+#
+#
+@CONFIGDIR@/scan.conf
+@CONFIGDIR@/srv.conf
+@CONFIGDIR@/flex/flex_eigene_scripte.conf
+
+@ZAPITDIR@/
+
+@FLAGDIR@/
+
+#/var/bin/
+#
+#/var/log/
+#/var/root/
+#/var/xupnpd/
+
+/etc/exports
 /etc/hostname
 /etc/hosts
-/etc/network
+/etc/network/interfaces
+/etc/passwd
+/etc/profile.local
 /etc/resolv.conf
+/etc/samba/smb.conf
 /etc/wpa_supplicant.conf
-/var/etc
-/var/tuxbox/config
+
+## Persönliche Sicherungen
 
 
 #----------------------------------------------------------------------------------------
 ## von der Sicherung auszuschließende Dateien, gekennzeichnet durch ein vorangestelltes -
 #----------------------------------------------------------------------------------------
--/var/etc/update.urls
--/var/tuxbox/config/cables.xml
--/var/tuxbox/config/encoding.conf
--/var/tuxbox/config/providermap.xml
--/var/tuxbox/config/radio-stations.xml
--/var/tuxbox/config/satellites.xml
--/var/tuxbox/config/settingsupdate.conf
--/var/tuxbox/config/tobackup.conf
+#-/var/etc/update.urls
+#-@CONFIGDIR@/cables.xml
+#-@CONFIGDIR@/encoding.conf
+#-@CONFIGDIR@/providermap.xml
+#-@CONFIGDIR@/radio-stations.xml
+#-@CONFIGDIR@/satellites.xml
+#-@CONFIGDIR@/settingsupdate.conf
+#-@CONFIGDIR@/tobackup.conf

data/control/Makefile.am

@@ -1,3 +1,6 @@
+#EXTRA_DIST = \
+#	migration.sh migration.sh.in
+
 installdir = $(CONTROLDIR)
 
 install_SCRIPTS = \

data/control/migration.sh.in

@@ -0,0 +1,65 @@
+#!/bin/sh
+
+cd @CONFIGDIR@
+if [ -e neutrino.conf ]; then
+	# remove NG leftovers
+	sed -i 's|ng_netfs_\(.*\)|netfs_\1|' neutrino.conf
+
+	# webradio_usr.xml was moved
+	sed -i "s|@CONFIGDIR@/webradio_usr.xml|@WEBRADIODIR_VAR@/webradio_usr.xml|" neutrino.conf
+	mkdir -p @WEBRADIODIR_VAR@/
+	if [ -e @CONFIGDIR@/webradio_usr.xml ]; then
+		mv @CONFIGDIR@/webradio_usr.xml @WEBRADIODIR_VAR@/
+	fi
+
+	# webtv_usr.xml was moved
+	sed -i "s|@CONFIGDIR@/webtv_usr.xml|@WEBTVDIR_VAR@/webtv_usr.xml|" neutrino.conf
+	mkdir -p @WEBTVDIR_VAR@/
+	if [ -e @CONFIGDIR@/webtv_usr.xml ]; then
+		mv @CONFIGDIR@/webtv_usr.xml @WEBTVDIR_VAR@/
+	fi
+
+	# remove all old glcd_ keywords; neutrino will add the new ones
+	if ! grep -q glcd_foreground_color neutrino.conf ; then
+		sed -i "/^glcd_/d" neutrino.conf
+	fi
+
+	sort neutrino.conf > neutrino.sort
+	mv neutrino.sort neutrino.conf
+fi
+
+if [ -e zapit/frontend.conf ]; then
+	# uni_qrg was renamed to uni_freq
+	sed -i "s|_uni_qrg=|_uni_freq=|g" @ZAPITDIR@/frontend.conf
+fi
+
+controlscripts="\
+	audioplayer.start \
+	audioplayer.end \
+	deepstandby.on \
+	deepstandby.off \
+	inactivity.on \
+	movieplayer.start \
+	movieplayer.end \
+	neutrino.start \
+	pictureviewer.start \
+	pictureviewer.end \
+	recording.timer \
+	recording.start \
+	recording.end \
+	scan.start \
+	scan.stop \
+	standby.on \
+	standby.off \
+"
+
+mkdir -p @CONTROLDIR_VAR@/
+for controlscript in $controlscripts; do
+	if [ -e $controlscript ]; then
+		mv $controlscript @CONTROLDIR_VAR@/
+	fi
+done
+
+# these control scripts hasn't counterparts in @CONTROLDIR_VAR@
+rm -f migration.sh
+rm -f flash.start

data/fonts/Makefile.am

@@ -17,10 +17,16 @@ install_DATA = \
 	tuxtxt.otb
 
 
-if BOXMODEL_CS_HD2
+if BOXMODEL_CST_HD2
 install_DATA += UnDotum.ttf
 endif
 
+if ! BOXMODEL_CST_HD1
+# icon font
+install_DATA += \
+	fa-solid-900.ttf
+endif
+
 install-data-hook:
 	cd $(DESTDIR)$(FONTDIR); \
 		mv $(neutrino_ttf) neutrino.ttf; \

data/fonts/fa-solid-900.LICENSE

@@ -0,0 +1,34 @@
+Font Awesome Free License
+-------------------------
+
+Font Awesome Free is free, open source, and GPL friendly. You can use it for
+commercial projects, open source projects, or really almost whatever you want.
+Full Font Awesome Free license: https://fontawesome.com/license/free.
+
+# Icons: CC BY 4.0 License (https://creativecommons.org/licenses/by/4.0/)
+In the Font Awesome Free download, the CC BY 4.0 license applies to all icons
+packaged as SVG and JS file types.
+
+# Fonts: SIL OFL 1.1 License (https://scripts.sil.org/OFL)
+In the Font Awesome Free download, the SIL OFL license applies to all icons
+packaged as web and desktop font files.
+
+# Code: MIT License (https://opensource.org/licenses/MIT)
+In the Font Awesome Free download, the MIT license applies to all non-font and
+non-icon files.
+
+# Attribution
+Attribution is required by MIT, SIL OFL, and CC BY licenses. Downloaded Font
+Awesome Free files already contain embedded comments with sufficient
+attribution, so you shouldn't need to do anything additional when using these
+files normally.
+
+We've kept attribution comments terse, so we ask that you do not actively work
+to remove them from files, especially code. They're a great way for folks to
+learn about Font Awesome.
+
+# Brand Icons
+All brand icons are trademarks of their respective owners. The use of these
+trademarks does not indicate endorsement of the trademark holder by Font
+Awesome, nor vice versa. **Please do not use brand logos for any purpose except
+to represent the company, product, or service to which they refer.**

data/icons/Makefile.am

@@ -3,6 +3,7 @@ SUBDIRS = \
 	filetypes \
 	headers \
 	hints \
+	hourglass \
 	locale \
 	movieplayer \
 	radar \

data/icons/buttons/Makefile.am

@@ -11,9 +11,10 @@ install_DATA = \
 	7.png \
 	8.png \
 	9.png \
-	blau.png \
 	btn_backward.png \
+	btn_blue.png \
 	btn_forward.png \
+	btn_green.png \
 	btn_option_off_active.png \
 	btn_option_off_inactive.png \
 	btn_option_on_active.png \
@@ -22,14 +23,15 @@ install_DATA = \
 	btn_play.png \
 	btn_record_active.png \
 	btn_record_inactive.png \
+	btn_red.png \
 	btn_stop.png \
 	btn_timer.png \
+	btn_yellow.png \
 	down.png \
 	dummy.png \
 	dummy_small.png \
 	epg.png \
-	gelb.png \
-	gruen.png \
+	epg_small.png \
 	help.png \
 	help_small.png \
 	home.png \
@@ -46,5 +48,4 @@ install_DATA = \
 	ok.png \
 	power.png \
 	right.png \
-	rot.png \
 	up.png

data/icons/headers/Makefile.am

@@ -3,23 +3,24 @@ installdir = $(ICONSDIR)
 install_DATA = \
 	audio.png \
 	bookmarkmanager.png \
+	boxinfo.png \
 	colors.png \
 	edit.png \
+	edit_find.png \
 	error.png \
 	features.png \
 	games.png \
 	icon_blue.png \
 	icon_green.png \
-	icon_movieplayer.png \
 	icon_red.png \
 	icon_yellow.png \
-	icon_ytplay.png \
 	information.png \
 	keybinding.png \
 	language.png \
 	lcd.png \
 	lock.png \
 	mainmenue.png \
+	movieplayer.png \
 	mp3.png \
 	multimedia.png \
 	network.png \
@@ -34,4 +35,5 @@ install_DATA = \
 	streaming.png \
 	timer.png \
 	upnp.png \
-	video.png
+	video.png \
+	ytplay.png