update version to 3.6.0

Prepared for multiplatform builds

.gitignore

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

Makefile.am

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

acinclude.m4

@@ -196,14 +196,22 @@ dnl automake <= 1.6 needs this specifications
 AC_SUBST(CONFIGDIR)
 AC_SUBST(DATADIR)
 AC_SUBST(FONTDIR)
+AC_SUBST(FONTDIR_VAR)
 AC_SUBST(GAMESDIR)
 AC_SUBST(LIBDIR)
 AC_SUBST(MNTDIR)
 AC_SUBST(PLUGINDIR)
+AC_SUBST(PLUGINDIR_VAR)
+AC_SUBST(WEBTVDIR)
+AC_SUBST(WEBTVDIR_VAR)
+AC_SUBST(PLUGINDIR_MNT)
 AC_SUBST(LUAPLUGINDIR)
 AC_SUBST(LOCALEDIR)
+AC_SUBST(LOCALEDIR_VAR)
 AC_SUBST(THEMESDIR)
+AC_SUBST(THEMESDIR_VAR)
 AC_SUBST(ICONSDIR)
+AC_SUBST(ICONSDIR_VAR)
 AC_SUBST(PRIVATE_HTTPDDIR)
 AC_SUBST(PUBLIC_HTTPDDIR)
 AC_SUBST(HOSTED_HTTPDDIR)

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT(Tuxbox-Neutrino,3.5.0)
+AC_INIT(Tuxbox-Neutrino,3.6.0)
 AM_INIT_AUTOMAKE([1.0.1 nostdinc])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
 
@@ -12,19 +12,27 @@ AC_PROG_CXX
 AC_DISABLE_STATIC
 AM_PROG_LIBTOOL
 
-# Add build information to config.h
+# Add build information to local_build_config.h.tmp
-# ---------------------------------
+# -------------------------------------------------
-
+rm -f local_build_config.h.tmp
-# Add host to config.h
+cat > local_build_config.h.tmp << EOF
-AC_DEFINE_UNQUOTED(USED_BUILD, ["$build"], [Build system under which the program was compiled on.])
+/* Build system under which the program was compiled on. */
-
+#define USED_BUILD "$build"
-# Add used CXXFLAGS to config.h
+/* Define to the used CXXFLAGS to compile this package. */
-AC_DEFINE_UNQUOTED(USED_CXXFLAGS, ["$CXXFLAGS"], [Define to the used CXXFLAGS to compile this package.])
+#define USED_CXXFLAGS "$CXXFLAGS"
-
+EOF
-# Get compiler (version)
-AH_TEMPLATE(USED_COMPILER, [Define to name and version of used compiler])
 if COMPILER=`$CC --version | head -n 1`; then
-    AC_DEFINE_UNQUOTED(USED_COMPILER, ["$COMPILER"])
+	cat >> local_build_config.h.tmp <<-EOF
+	/* Define to name and version of used compiler */
+	#define USED_COMPILER "$COMPILER"
+	EOF
+fi
+# only update header if it differs to avoid unnecessary rebuilds
+if ! diff local_build_config.h.tmp local_build_config.h >/dev/null 2>&1; then
+	rm -f local_build_config.h
+	mv local_build_config.h.tmp local_build_config.h
+else
+	rm -f local_build_config.h.tmp
 fi
 
 AC_ARG_ENABLE(ffmpegdec,
@@ -126,7 +134,17 @@ TUXBOX_APPS_LIB_PKGCONFIG(PNG,libpng)
 TUXBOX_APPS_LIB_PKGCONFIG(AVFORMAT,libavformat)
 TUXBOX_APPS_LIB_PKGCONFIG(AVCODEC,libavcodec)
 TUXBOX_APPS_LIB_PKGCONFIG(AVUTIL,libavutil)
-TUXBOX_APPS_LIB_PKGCONFIG(BLURAY,libbluray)
+if test "$BOXTYPE" = "coolstream"; then
+	TUXBOX_APPS_LIB_PKGCONFIG(BLURAY,libbluray)
+fi
+
+if test "$BOXTYPE" = "coolstream" ||
+   test "$BOXTYPE" = "generic" ||
+   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)
@@ -157,6 +175,12 @@ AC_ARG_ENABLE(viasatepg,
 	[  --enable-viasatepg                  enable ViaSat EPG code (experimental)],
 	[AC_DEFINE(ENABLE_VIASATEPG,1,[enable ViaSat EPG code])])
 
+AC_ARG_ENABLE(fastscan,
+	[  --enable-fastscan                   enable Fastscan code)],
+	[AC_DEFINE(ENABLE_FASTSCAN,1,[enable fastscan code])])
+
+AM_CONDITIONAL(ENABLE_FASTSCAN, test "$enable_fastscan" = "yes")
+
 AC_ARG_ENABLE(giflib,
 	AS_HELP_STRING(--enable-giflib,use giflib instead of libungif),
 	,[enable_giflib=no])
@@ -197,10 +221,35 @@ if test "$enable_upnp" = "yes"; then
 	AC_DEFINE(ENABLE_UPNP,1,[include UPNP support - currently broken])
 fi
 
+AC_ARG_ENABLE(extupdate,
+	AS_HELP_STRING(--enable-extupdate,include extended update routine),
+	,[enable_extupdate=no])
+
+AM_CONDITIONAL(ENABLE_EXTUPDATE,test "$enable_extupdate" = "yes")
+if test "$enable_extupdate" = "yes"; then
+	AC_DEFINE(ENABLE_EXTUPDATE,1,[include extended update routine])
+fi
+
+AC_ARG_WITH(stb-hal-includes,
+	[  --with-stb-hal-includes=PATH  path for libstb-hal includes [[NONE]]],
+	[STB_HAL_INC="$withval"],[STB_HAL_INC=""])
+AC_ARG_WITH(stb-hal-build,
+	[  --with-stb-hal-build=PATH   path where libstb-hal is built [[NONE]]],
+	[STB_HAL_LIB="-L$withval"],[STB_HAL_LIB=""])
+
+AM_CONDITIONAL(USE_STB_HAL, test "$BOXTYPE" != "coolstream")
+if test "$BOXTYPE" != coolstream; then
+	AC_DEFINE(USE_STB_HAL, 1,[use libstb-hal])
+	if test "$STB_HAL_INC" = ""; then
+		AC_MSG_ERROR([need libstb-hal includes path with --with-stb-hal-includes=...])
+	fi
+	HWLIB_CFLAGS="-I$STB_HAL_INC"
+fi
+
 # Lua - embeddable scripting language
 AC_ARG_ENABLE(lua,
-	AS_HELP_STRING(--enable-lua,include Lua support),
+	AS_HELP_STRING(--disable-lua,disable Lua support),
-	,[enable_lua=no])
+	,[enable_lua=yes])
 
 AM_CONDITIONAL(ENABLE_LUA,test "$enable_lua" = "yes")
 if test "$enable_lua" = "yes"; then
@@ -277,6 +326,8 @@ 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)

data/icons/Makefile.am

@@ -9,3 +9,6 @@ SUBDIRS = \
 	slider \
 	status \
 	various
+
+install-data-hook:
+	$(INSTALL) -d $(DESTDIR)/$(ICONSDIR)/logo

data/icons/headers/Makefile.am

@@ -20,6 +20,7 @@ install_DATA = \
 	multimedia.png \
 	network.png \
 	personalize.png \
+	pictureviewer.png \
 	recording.png \
 	settings.png \
 	shell.png \

data/icons/slider/Makefile.am

@@ -1,9 +1,9 @@
 installdir = $(ICONSDIR)
 
 install_DATA = \
-	volumebody.png \
+	slider_alpha.png \
-	volumeslider2.png \
+	slider_blue.png \
-	volumeslider2alpha.png \
+	slider_body.png \
-	volumeslider2blue.png \
+	slider_green.png \
-	volumeslider2green.png \
+	slider_inactive.png \
-	volumeslider2red.png
+	slider_red.png