From cec619889fc2d2108ca6e952cffb7462be1dbfc5 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Thu, 7 Dec 2017 12:40:40 +0100 Subject: [PATCH 01/19] acinclude: remove some double code Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/ee685c05c2c01ea4a3e4ce3524e92da94ca348c5 Author: vanhofen Date: 2017-12-07 (Thu, 07 Dec 2017) Origin message was: ------------------ - acinclude: remove some double code ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- acinclude.m4 | 4 ---- 1 file changed, 4 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 0830e2255..d38e3151d 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -169,9 +169,6 @@ TUXBOX_APPS_DIRECTORY_ONE(plugindir_var,PLUGINDIR_VAR,localstatedir,/var,/tuxbox TUXBOX_APPS_DIRECTORY_ONE(webtvdir_var,WEBTVDIR_VAR,localstatedir,/var,/tuxbox/plugins/webtv, [--with-webtvdir_var=PATH ],[where to find the livestreamScriptPath in /var]) -TUXBOX_APPS_DIRECTORY_ONE(webtvdir,WEBTVDIR,datadir,/share,/tuxbox/neutrino/webtv, - [--with-webtvdir=PATH ],[where to find the webtv content]) - TUXBOX_APPS_DIRECTORY_ONE(plugindir_mnt,PLUGINDIR_MNT,mntdir,/mnt,/plugins, [--with-plugindir_mnt=PATH ],[where to find the the extern plugins]) @@ -214,7 +211,6 @@ AC_SUBST(CONFIGDIR) AC_SUBST(DATADIR) AC_SUBST(FONTDIR) AC_SUBST(FONTDIR_VAR) -AC_SUBST(FLAGDIR) AC_SUBST(GAMESDIR) AC_SUBST(LIBDIR) AC_SUBST(MNTDIR) From 2c21ca91fa3adc444e32c3a426cd8aa7f8976714 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Thu, 7 Dec 2017 12:40:40 +0100 Subject: [PATCH 02/19] acinclude: small resort to get the plugin-dir variables consecutively Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/1a4f9ce465187283ceb850d980896ec28a8a0c49 Author: vanhofen Date: 2017-12-07 (Thu, 07 Dec 2017) Origin message was: ------------------ - acinclude: small resort to get the plugin-dir variables consecutively ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- acinclude.m4 | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index d38e3151d..f186296bd 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -166,15 +166,18 @@ TUXBOX_APPS_DIRECTORY_ONE(plugindir,PLUGINDIR,libdir,/lib,/tuxbox/plugins, TUXBOX_APPS_DIRECTORY_ONE(plugindir_var,PLUGINDIR_VAR,localstatedir,/var,/tuxbox/plugins, [--with-plugindir_var=PATH ],[where to find the plugins in /var]) -TUXBOX_APPS_DIRECTORY_ONE(webtvdir_var,WEBTVDIR_VAR,localstatedir,/var,/tuxbox/plugins/webtv, - [--with-webtvdir_var=PATH ],[where to find the livestreamScriptPath in /var]) - TUXBOX_APPS_DIRECTORY_ONE(plugindir_mnt,PLUGINDIR_MNT,mntdir,/mnt,/plugins, [--with-plugindir_mnt=PATH ],[where to find the the extern plugins]) TUXBOX_APPS_DIRECTORY_ONE(luaplugindir,LUAPLUGINDIR,libdir,/lib,/tuxbox/luaplugins, [--with-luaplugindir=PATH ],[where to find Lua plugins]) +TUXBOX_APPS_DIRECTORY_ONE(webtvdir,WEBTVDIR,datadir,/share,/tuxbox/neutrino/webtv, + [--with-webtvdir=PATH ],[where to find the webtv content]) + +TUXBOX_APPS_DIRECTORY_ONE(webtvdir_var,WEBTVDIR_VAR,localstatedir,/var,/tuxbox/webtv, + [--with-webtvdir_var=PATH ],[where to find the webtv content in /var]) + TUXBOX_APPS_DIRECTORY_ONE(localedir,LOCALEDIR,datadir,/share, /tuxbox/neutrino/locale, [--with-localedir=PATH ],[where to find the locale]) @@ -216,10 +219,10 @@ 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(WEBTVDIR) +AC_SUBST(WEBTVDIR_VAR) AC_SUBST(LOCALEDIR) AC_SUBST(LOCALEDIR_VAR) AC_SUBST(THEMESDIR) From 677e1959853bf6aec7fa35d141f2c615d32e4040 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Thu, 7 Dec 2017 13:08:51 +0100 Subject: [PATCH 03/19] acinclude/configure: unify usage of AS_HELP_STRING(); minor format changes Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/1e5ac799bedf4d732b6f821e62b064c8a3e613e7 Author: vanhofen Date: 2017-12-07 (Thu, 07 Dec 2017) Origin message was: ------------------ - acinclude/configure: unify usage of AS_HELP_STRING(); minor format changes ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- acinclude.m4 | 41 ++++++++++-------- configure.ac | 119 +++++++++++++++++++++++++-------------------------- 2 files changed, 81 insertions(+), 79 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index f186296bd..874795393 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -5,36 +5,40 @@ AM_MAINTAINER_MODE AC_GNU_SOURCE AC_ARG_WITH(target, - [ --with-target=TARGET target for compilation [[native,cdk]]], - [TARGET="$withval"],[TARGET="native"]) + AS_HELP_STRING([--with-target=TARGET], [target for compilation [[native,cdk]]]), + [TARGET="$withval"], + [TARGET="native"]) AC_ARG_WITH(targetprefix, - [ --with-targetprefix=PATH prefix relative to target root (only applicable in cdk mode)], - [TARGET_PREFIX="$withval"],[TARGET_PREFIX=""]) + AS_HELP_STRING([--with-targetprefix=PATH], [prefix relative to target root (only applicable in cdk mode)]), + [TARGET_PREFIX="$withval"], + [TARGET_PREFIX=""]) AC_ARG_WITH(debug, - [ --without-debug disable debugging code], - [DEBUG="$withval"],[DEBUG="yes"]) + AS_HELP_STRING([--without-debug], [disable debugging code]), + [DEBUG="$withval"], + [DEBUG="yes"]) if test "$DEBUG" = "yes"; then DEBUG_CFLAGS="-g3 -ggdb" - AC_DEFINE(DEBUG,1,[Enable debug messages]) + AC_DEFINE(DEBUG, 1, [Enable debug messages]) fi AC_ARG_WITH(libcoolstream-static-dir, - [ --with-libcoolstream-static-dir=PATH path for static libcoolstream], - [LIBCOOLSTREAM_STATIC_DIR="$withval"],[LIBCOOLSTREAM_STATIC_DIR=""]) + AS_HELP_STRING([--with-libcoolstream-static-dir=PATH], [path for static libcoolstream]), + [LIBCOOLSTREAM_STATIC_DIR="$withval"], + [LIBCOOLSTREAM_STATIC_DIR=""]) AC_ARG_ENABLE(libcoolstream-static, - AS_HELP_STRING(--enable-libcoolstream-static,[libcoolstream static linked for testing])) -AM_CONDITIONAL(ENABLE_LIBCOOLSTREAM_STATIC,test "$enable_libcoolstream_static" = "yes") + AS_HELP_STRING([--enable-libcoolstream-static], [libcoolstream static linked for testing])) +AM_CONDITIONAL(ENABLE_LIBCOOLSTREAM_STATIC, test "$enable_libcoolstream_static" = "yes") AC_ARG_ENABLE(reschange, - AS_HELP_STRING(--enable-reschange,enable change the osd resolution (default for hd2))) + AS_HELP_STRING([--enable-reschange], [enable change the osd resolution (default for hd2 and hd51)])) AM_CONDITIONAL(ENABLE_RESCHANGE,test "$enable_reschange" = "yes") if test "$enable_reschange" = "yes"; then - AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION,1,[enable change the osd resolution]) + AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION, 1, [enable change the osd resolution]) fi AC_MSG_CHECKING(target) @@ -155,7 +159,7 @@ TUXBOX_APPS_DIRECTORY_ONE(fontdir_var,FONTDIR_VAR,localstatedir,/var,/tuxbox/fon [--with-fontdir_var=PATH ],[where to find the fonts in /var]) TUXBOX_APPS_DIRECTORY_ONE(gamesdir,GAMESDIR,localstatedir,/var,/tuxbox/games, - [--with-gamesdir=PATH ],[where games data is stored]) + [--with-gamesdir=PATH ],[where to find the games]) TUXBOX_APPS_DIRECTORY_ONE(libdir,LIBDIR,libdir,/lib,/tuxbox, [--with-libdir=PATH ],[where to find the internal libs]) @@ -311,14 +315,15 @@ _TUXBOX_APPS_LIB_PKGCONFIG($1,$2) AC_DEFUN([TUXBOX_BOXTYPE],[ AC_ARG_WITH(boxtype, - [ --with-boxtype valid values: tripledragon,coolstream,spark,azbox,generic,armbox], + AS_HELP_STRING([--with-boxtype], [valid values: tripledragon, coolstream, spark, azbox, generic, armbox]), [case "${withval}" in tripledragon|coolstream|spark|azbox|generic|armbox) BOXTYPE="$withval" ;; *) AC_MSG_ERROR([bad value $withval for --with-boxtype]) ;; - esac], [BOXTYPE="coolstream"]) + esac], + [BOXTYPE="coolstream"]) AC_ARG_WITH(boxmodel, [ --with-boxmodel valid for coolstream: hd1, hd2 @@ -361,8 +366,8 @@ AC_ARG_WITH(boxmodel, *) AC_MSG_ERROR([unsupported value $withval for --with-boxmodel]) ;; - esac], [test "$BOXTYPE" = "coolstream" && BOXMODEL="hd1" || true] - ) + esac], + [test "$BOXTYPE" = "coolstream" && BOXMODEL="hd1" || true]) AC_SUBST(BOXTYPE) AC_SUBST(BOXMODEL) diff --git a/configure.ac b/configure.ac index b476e1633..548d85db0 100644 --- a/configure.ac +++ b/configure.ac @@ -36,23 +36,23 @@ else fi AC_ARG_ENABLE(ffmpegdec, - AS_HELP_STRING(--enable-ffmpegdec,include ffmpeg decoder support), + 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]) + 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])], +AC_ARG_WITH(tremor, + AS_HELP_STRING([--with-tremor], [use libvorbisidec instead of libogg/libvorbis]), [TREMOR="$withval"], [TREMOR=no]) -AC_ARG_WITH([tremor-static], [AS_HELP_STRING([--with-tremor-static], - [use statically linked libvorbisidec instead of libogg/libvorbis])], +AC_ARG_WITH(tremor-static, + AS_HELP_STRING([--with-tremor-static], [use statically linked libvorbisidec instead of libogg/libvorbis]), [TREMOR_STATIC="$withval"], [TREMOR_STATIC=no]) @@ -62,7 +62,7 @@ fi if test "$TREMOR" = "yes"; then TUXBOX_APPS_LIB_PKGCONFIG(VORBISIDEC,vorbisidec) - AC_DEFINE(USE_TREMOR,1,use libvorbisidec/tremor library) + AC_DEFINE(USE_TREMOR, 1, use libvorbisidec/tremor library) fi if test "$TREMOR_STATIC" = "yes"; then @@ -147,7 +147,7 @@ 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]) + AC_DEFINE(SCREENSHOT, 1, [Define to 1 if the platform supports screenshots]) fi TUXBOX_APPS_LIB_PKGCONFIG(SIGC,sigc++-2.0) @@ -165,100 +165,98 @@ TUXBOX_APPS_LIB_PKGCONFIG(SIGC,sigc++-2.0) #TUXBOX_APPS_LIB_PKGCONFIG(TUXTXT,tuxbox-tuxtxt) AC_ARG_ENABLE(keyboard-no-rc, - [ --enable-keyboard-no-rc enable keyboard control, disable rc control], - [AC_DEFINE(KEYBOARD_INSTEAD_OF_REMOTE_CONTROL,1,[enable keyboard control, disable rc control])]) + AS_HELP_STRING([--enable-keyboard-no-rc], [enable keyboard control, disable rc control]), + AC_DEFINE(KEYBOARD_INSTEAD_OF_REMOTE_CONTROL, 1, [enable keyboard control, disable rc control])) AC_ARG_ENABLE(mdev, - [ --enable-mdev disable broken neutrino mount hack, use with mdev], - [AC_DEFINE(ASSUME_MDEV,1,[disable broken neutrino mount hack, use with mdev])]) + AS_HELP_STRING([--enable-mdev], [disable broken neutrino mount hack, use with mdev]), + AC_DEFINE(ASSUME_MDEV, 1, [disable broken neutrino mount hack, use with mdev])) AC_ARG_ENABLE(freesatepg, - [ --enable-freesatepg enable Freesat EPG code (experimental)], - [AC_DEFINE(ENABLE_FREESATEPG,1,[enable Freesat EPG code])]) + AS_HELP_STRING([--enable-freesatepg], [enable Freesat EPG code (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])]) + AS_HELP_STRING([--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])]) + AS_HELP_STRING([--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), + AS_HELP_STRING([--enable-giflib], [use giflib instead of libungif]), ,[enable_giflib=no]) -AM_CONDITIONAL(ENABLE_GIFLIB,test "$enable_giflib" = "yes") +AM_CONDITIONAL(ENABLE_GIFLIB, test "$enable_giflib" = "yes") if test "$enable_giflib" = "yes"; then - AC_DEFINE(ENABLE_GIFLIB,1,[use giflib instead of libungif]) + 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), + AS_HELP_STRING([--enable-pugixml], [use pugixml instead of xmltree]), ,[enable_pugixml=no]) -AM_CONDITIONAL(USE_PUGIXML,test "$enable_pugixml" = "yes") +AM_CONDITIONAL(USE_PUGIXML, test "$enable_pugixml" = "yes") if test "$enable_pugixml" = "yes"; then - AC_DEFINE(USE_PUGIXML,1,[use pugixml instead of xmltree]) + 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), + AS_HELP_STRING([--enable-flac], [include FLAC support]), ,[enable_flac=no]) -AM_CONDITIONAL(ENABLE_FLAC,test "$enable_flac" = "yes") +AM_CONDITIONAL(ENABLE_FLAC, test "$enable_flac" = "yes") if test "$enable_flac" = "yes"; then - AC_DEFINE(ENABLE_FLAC,1,[include FLAC support]) + AC_DEFINE(ENABLE_FLAC, 1, [include FLAC support]) fi -# UPNP - upnp browser (borken right now) AC_ARG_ENABLE(upnp, - AS_HELP_STRING(--disable-upnp,disable UPNP support), + AS_HELP_STRING([--disable-upnp], [disable UPNP support]), ,[enable_upnp=yes]) -AM_CONDITIONAL(ENABLE_UPNP,test "$enable_upnp" = "yes") +AM_CONDITIONAL(ENABLE_UPNP, test "$enable_upnp" = "yes") if test "$enable_upnp" = "yes"; then - AC_DEFINE(ENABLE_UPNP,1,[include UPNP support - currently broken]) + AC_DEFINE(ENABLE_UPNP, 1, [include UPNP support]) fi AC_ARG_ENABLE(extupdate, - AS_HELP_STRING(--enable-extupdate,include extended update routine), + AS_HELP_STRING([--enable-extupdate], [include extended update routine]), ,[enable_extupdate=no]) -AM_CONDITIONAL(ENABLE_EXTUPDATE,test "$enable_extupdate" = "yes") +AM_CONDITIONAL(ENABLE_EXTUPDATE, test "$enable_extupdate" = "yes") if test "$enable_extupdate" = "yes"; then - AC_DEFINE(ENABLE_EXTUPDATE,1,[include extended update routine]) + AC_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=""]) + AS_HELP_STRING([--with-stb-hal-includes=PATH], [path for libstb-hal includes [[NONE]]]), + [STB_HAL_INC="$withval"], + [STB_HAL_INC=""]) + AC_ARG_WITH(stb-hal-build, - [ --with-stb-hal-build=PATH path where libstb-hal is built [[NONE]]], - [STB_HAL_LIB="-L$withval"],[STB_HAL_LIB=""]) + AS_HELP_STRING([--with-stb-hal-build=PATH], [path where libstb-hal is built [[NONE]]]), + [STB_HAL_LIB="-L$withval"], + [STB_HAL_LIB=""]) AM_CONDITIONAL(USE_STB_HAL, test "$BOXTYPE" != "coolstream") if test "$BOXTYPE" != coolstream; then - AC_DEFINE(USE_STB_HAL, 1,[use libstb-hal]) + AC_DEFINE(USE_STB_HAL, 1, [use libstb-hal]) if test "$STB_HAL_INC" = ""; then AC_MSG_ERROR([need libstb-hal includes path with --with-stb-hal-includes=...]) fi HWLIB_CFLAGS="-I$STB_HAL_INC" fi -# Lua - embeddable scripting language AC_ARG_ENABLE(lua, - AS_HELP_STRING(--disable-lua,disable Lua support), + AS_HELP_STRING([--disable-lua], [disable Lua support]), ,[enable_lua=yes]) -AM_CONDITIONAL(ENABLE_LUA,test "$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]) + 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..." @@ -267,29 +265,28 @@ if test "$enable_lua" = "yes"; then ]) ]) # 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, 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])]) + AS_HELP_STRING([--enable-cleanup], [enable cleanup on exit]), + AC_DEFINE(EXIT_CLEANUP, 1, [enable cleanup on exit])) AC_ARG_ENABLE(pip, - [ --enable-pip enable picture in picture support], - [AC_DEFINE(ENABLE_PIP,1,[enable picture in picture support])]) - + AS_HELP_STRING([--enable-pip], [enable picture in picture support]), + AC_DEFINE(ENABLE_PIP, 1, [enable picture in picture support])) AC_ARG_ENABLE(testing, - AS_HELP_STRING(--enable-testing,include devel code parts for neutrino tests)) + AS_HELP_STRING([--enable-testing], [include dev code parts for neutrino tests])) -AM_CONDITIONAL(ENABLE_TESTING,test "$enable_testing" = "yes") +AM_CONDITIONAL(ENABLE_TESTING, test "$enable_testing" = "yes") if test "$enable_testing" = "yes"; then - AC_DEFINE(ENABLE_TESTING,1,[include devel code parts for neutrino tests - not recommended for general users!]) + AC_DEFINE(ENABLE_TESTING, 1, [include dev code parts for neutrino tests - not recommended for general users!]) fi -AC_ARG_ENABLE([fribidi], - AS_HELP_STRING([--enable-fribidi], [enable fribidi support]) -) +AC_ARG_ENABLE(fribidi, + AS_HELP_STRING([--enable-fribidi], [enable fribidi support])) + AM_CONDITIONAL(ENABLE_FRIBIDI, test "$enable_fribidi" = "yes") AS_IF([test "$enable_fribidi" = "yes"], AC_DEFINE(ENABLE_FRIBIDI, 1, [enable fribidi support]) @@ -297,16 +294,16 @@ AS_IF([test "$enable_fribidi" = "yes"], if test "$BOXTYPE" = "coolstream"; then if test -e ${srcdir}/lib/hardware/coolstream/hd1/libcoolstream/nevis_ir.h; then - AC_DEFINE(HAVE_COOLSTREAM_NEVIS_IR_H,1,[Define to 1 if you have the header file.]) + AC_DEFINE(HAVE_COOLSTREAM_NEVIS_IR_H, 1, [Define to 1 if you have the header file.]) fi HWLIB_CFLAGS='-I$(top_srcdir)/lib/hardware/coolstream/hd1/libcoolstream' if test "$BOXMODEL" = "hd2"; then if test -e ${srcdir}/lib/hardware/coolstream/hd2/libcoolstream/cs_ir_generic.h; then - AC_DEFINE(HAVE_COOLSTREAM_CS_IR_GENERIC_H,1,[Define to 1 if you have the header file.]) + AC_DEFINE(HAVE_COOLSTREAM_CS_IR_GENERIC_H, 1, [Define to 1 if you have the header file.]) fi if test -e ${srcdir}/lib/hardware/coolstream/hd2/libcoolstream/cs_frontpanel.h; then - AC_DEFINE(HAVE_COOLSTREAM_CS_FRONTPANEL_H,1,[Define to 1 if you have the header file.]) + AC_DEFINE(HAVE_COOLSTREAM_CS_FRONTPANEL_H, 1, [Define to 1 if you have the header file.]) fi HWLIB_CFLAGS='-I$(top_srcdir)/lib/hardware/coolstream/hd2/libcoolstream' fi From aa0e28f8bb9a04235d3935c31282126fa41ede24 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Thu, 7 Dec 2017 13:08:51 +0100 Subject: [PATCH 04/19] configure: cleanup from commented code Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/7926c08093f116974d367b50100beecb550eb70e Author: vanhofen Date: 2017-12-07 (Thu, 07 Dec 2017) Origin message was: ------------------ - configure: cleanup from commented code ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- configure.ac | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/configure.ac b/configure.ac index 548d85db0..498529e15 100644 --- a/configure.ac +++ b/configure.ac @@ -152,18 +152,6 @@ fi TUXBOX_APPS_LIB_PKGCONFIG(SIGC,sigc++-2.0) -#TUXBOX_APPS_LIB_PKGCONFIG(CONFIGFILE,tuxbox-configfile) -#TUXBOX_APPS_LIB_PKGCONFIG(CONNECTION,tuxbox-connection) -#TUXBOX_APPS_LIB_PKGCONFIG(EVENTSERVER,tuxbox-eventserver) -#TUXBOX_APPS_LIB_PKGCONFIG(LCDDISPLAY,tuxbox-lcddisplay) -#TUXBOX_APPS_LIB_PKGCONFIG(LIRCDCLIENT,tuxbox-lircdclient) -#TUXBOX_APPS_LIB_PKGCONFIG(NET,tuxbox-net) -#TUXBOX_APPS_LIB_PKGCONFIG(PLUGINS,tuxbox-plugins) -#TUXBOX_APPS_LIB_PKGCONFIG(TUXBOX,tuxbox) -#TUXBOX_APPS_LIB_PKGCONFIG(UCODES,tuxbox-ucodes) -#TUXBOX_APPS_LIB_PKGCONFIG(MPEGTOOLS,tuxbox-mpegtools) -#TUXBOX_APPS_LIB_PKGCONFIG(TUXTXT,tuxbox-tuxtxt) - AC_ARG_ENABLE(keyboard-no-rc, AS_HELP_STRING([--enable-keyboard-no-rc], [enable keyboard control, disable rc control]), AC_DEFINE(KEYBOARD_INSTEAD_OF_REMOTE_CONTROL, 1, [enable keyboard control, disable rc control])) From 30978f21e343eac24c1583f221dd4ef04c28f9fe Mon Sep 17 00:00:00 2001 From: vanhofen Date: Thu, 7 Dec 2017 13:08:51 +0100 Subject: [PATCH 05/19] acinclude: replace custom formatting in TUXBOX_APPS_DIRECTORY_ONE with AS_HELP_STRING() Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/9511a086be0ba04d13d55653f6141636913b46c1 Author: vanhofen Date: 2017-12-07 (Thu, 07 Dec 2017) Origin message was: ------------------ - acinclude: replace custom formatting in TUXBOX_APPS_DIRECTORY_ONE with AS_HELP_STRING() ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- acinclude.m4 | 92 ++++++++++++++++++++++++++-------------------------- 1 file changed, 46 insertions(+), 46 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 874795393..6087f7448 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -25,7 +25,7 @@ if test "$DEBUG" = "yes"; then fi AC_ARG_WITH(libcoolstream-static-dir, - AS_HELP_STRING([--with-libcoolstream-static-dir=PATH], [path for static libcoolstream]), + AS_HELP_STRING([--with-libcoolstream-static-dir=PATH], [path for static libcoolstream [[NONE]]]), [LIBCOOLSTREAM_STATIC_DIR="$withval"], [LIBCOOLSTREAM_STATIC_DIR=""]) @@ -104,7 +104,7 @@ AC_DEFUN([TUXBOX_EXPAND_VARIABLE],[__$1="$2" ]) AC_DEFUN([TUXBOX_APPS_DIRECTORY_ONE],[ -AC_ARG_WITH($1,[ $6$7 [[PREFIX$4$5]]],[ +AC_ARG_WITH($1, AS_HELP_STRING([$6], [$7 [[PREFIX$4$5]]], [32], [79]), [ _$2=$withval if test "$TARGET" = "cdk"; then $2=`eval echo "$TARGET_PREFIX$withval"` # no indirection possible IMNSHO @@ -146,71 +146,71 @@ else mntdir="/mnt" # hack fi -TUXBOX_APPS_DIRECTORY_ONE(configdir,CONFIGDIR,localstatedir,/var,/tuxbox/config, - [--with-configdir=PATH ],[where to find the config files]) +TUXBOX_APPS_DIRECTORY_ONE(configdir, CONFIGDIR, localstatedir, /var, /tuxbox/config, + [--with-configdir=PATH], [where to find the config files]) -TUXBOX_APPS_DIRECTORY_ONE(datadir,DATADIR,datadir,/share,/tuxbox, - [--with-datadir=PATH ],[where to find data]) +TUXBOX_APPS_DIRECTORY_ONE(datadir, DATADIR, datadir, /share, /tuxbox, + [--with-datadir=PATH], [where to find data]) -TUXBOX_APPS_DIRECTORY_ONE(fontdir,FONTDIR,datadir,/share,/fonts, - [--with-fontdir=PATH ],[where to find the fonts]) +TUXBOX_APPS_DIRECTORY_ONE(fontdir, FONTDIR, datadir, /share, /fonts, + [--with-fontdir=PATH], [where to find the fonts]) -TUXBOX_APPS_DIRECTORY_ONE(fontdir_var,FONTDIR_VAR,localstatedir,/var,/tuxbox/fonts, - [--with-fontdir_var=PATH ],[where to find the fonts in /var]) +TUXBOX_APPS_DIRECTORY_ONE(fontdir_var, FONTDIR_VAR, localstatedir, /var, /tuxbox/fonts, + [--with-fontdir_var=PATH], [where to find the fonts in /var]) -TUXBOX_APPS_DIRECTORY_ONE(gamesdir,GAMESDIR,localstatedir,/var,/tuxbox/games, - [--with-gamesdir=PATH ],[where to find the games]) +TUXBOX_APPS_DIRECTORY_ONE(gamesdir, GAMESDIR, localstatedir, /var, /tuxbox/games, + [--with-gamesdir=PATH], [where to find the games]) -TUXBOX_APPS_DIRECTORY_ONE(libdir,LIBDIR,libdir,/lib,/tuxbox, - [--with-libdir=PATH ],[where to find the internal libs]) +TUXBOX_APPS_DIRECTORY_ONE(libdir, LIBDIR, libdir, /lib, /tuxbox, + [--with-libdir=PATH], [where to find the internal libs]) -TUXBOX_APPS_DIRECTORY_ONE(plugindir,PLUGINDIR,libdir,/lib,/tuxbox/plugins, - [--with-plugindir=PATH ],[where to find the plugins]) +TUXBOX_APPS_DIRECTORY_ONE(plugindir, PLUGINDIR, libdir, /lib, /tuxbox/plugins, + [--with-plugindir=PATH], [where to find the plugins]) -TUXBOX_APPS_DIRECTORY_ONE(plugindir_var,PLUGINDIR_VAR,localstatedir,/var,/tuxbox/plugins, - [--with-plugindir_var=PATH ],[where to find the plugins in /var]) +TUXBOX_APPS_DIRECTORY_ONE(plugindir_var, PLUGINDIR_VAR, localstatedir, /var, /tuxbox/plugins, + [--with-plugindir_var=PATH], [where to find the plugins in /var]) -TUXBOX_APPS_DIRECTORY_ONE(plugindir_mnt,PLUGINDIR_MNT,mntdir,/mnt,/plugins, - [--with-plugindir_mnt=PATH ],[where to find the the extern plugins]) +TUXBOX_APPS_DIRECTORY_ONE(plugindir_mnt, PLUGINDIR_MNT, mntdir, /mnt, /plugins, + [--with-plugindir_mnt=PATH], [where to find the the extern plugins]) -TUXBOX_APPS_DIRECTORY_ONE(luaplugindir,LUAPLUGINDIR,libdir,/lib,/tuxbox/luaplugins, - [--with-luaplugindir=PATH ],[where to find Lua plugins]) +TUXBOX_APPS_DIRECTORY_ONE(luaplugindir, LUAPLUGINDIR, libdir, /lib, /tuxbox/luaplugins, + [--with-luaplugindir=PATH], [where to find Lua plugins]) -TUXBOX_APPS_DIRECTORY_ONE(webtvdir,WEBTVDIR,datadir,/share,/tuxbox/neutrino/webtv, - [--with-webtvdir=PATH ],[where to find the webtv content]) +TUXBOX_APPS_DIRECTORY_ONE(webtvdir, WEBTVDIR, datadir, /share, /tuxbox/neutrino/webtv, + [--with-webtvdir=PATH], [where to find the webtv content]) -TUXBOX_APPS_DIRECTORY_ONE(webtvdir_var,WEBTVDIR_VAR,localstatedir,/var,/tuxbox/webtv, - [--with-webtvdir_var=PATH ],[where to find the webtv content in /var]) +TUXBOX_APPS_DIRECTORY_ONE(webtvdir_var, WEBTVDIR_VAR, localstatedir, /var, /tuxbox/webtv, + [--with-webtvdir_var=PATH], [where to find the webtv content in /var]) -TUXBOX_APPS_DIRECTORY_ONE(localedir,LOCALEDIR,datadir,/share, /tuxbox/neutrino/locale, - [--with-localedir=PATH ],[where to find the locale]) +TUXBOX_APPS_DIRECTORY_ONE(localedir, LOCALEDIR,datadir, /share, /tuxbox/neutrino/locale, + [--with-localedir=PATH], [where to find the locale]) -TUXBOX_APPS_DIRECTORY_ONE(localedir_var,LOCALEDIR_VAR,localstatedir,/var,/tuxbox/locale, - [--with-localedir_var=PATH ],[where to find the locale in /var]) +TUXBOX_APPS_DIRECTORY_ONE(localedir_var, LOCALEDIR_VAR, localstatedir, /var, /tuxbox/locale, + [--with-localedir_var=PATH], [where to find the locale in /var]) -TUXBOX_APPS_DIRECTORY_ONE(themesdir,THEMESDIR,datadir,/share, /tuxbox/neutrino/themes, - [--with-themesdir=PATH ],[where to find the themes]) +TUXBOX_APPS_DIRECTORY_ONE(themesdir, THEMESDIR, datadir, /share, /tuxbox/neutrino/themes, + [--with-themesdir=PATH], [where to find the themes]) -TUXBOX_APPS_DIRECTORY_ONE(themesdir_var,THEMESDIR_VAR,localstatedir,/var,/tuxbox/themes, - [--with-themesdir_var=PATH ],[where to find the themes in /var]) +TUXBOX_APPS_DIRECTORY_ONE(themesdir_var, THEMESDIR_VAR, localstatedir, /var, /tuxbox/themes, + [--with-themesdir_var=PATH], [where to find the themes in /var]) -TUXBOX_APPS_DIRECTORY_ONE(iconsdir,ICONSDIR,datadir,/share, /tuxbox/neutrino/icons, - [--with-iconsdir=PATH ],[where to find the icons]) +TUXBOX_APPS_DIRECTORY_ONE(iconsdir, ICONSDIR, datadir, /share, /tuxbox/neutrino/icons, + [--with-iconsdir=PATH], [where to find the icons]) -TUXBOX_APPS_DIRECTORY_ONE(iconsdir_var,ICONSDIR_VAR,localstatedir,/var,/tuxbox/icons, - [--with-iconsdir_var=PATH ],[where to find the icons in /var]) +TUXBOX_APPS_DIRECTORY_ONE(iconsdir_var, ICONSDIR_VAR, localstatedir, /var, /tuxbox/icons, + [--with-iconsdir_var=PATH], [where to find the icons in /var]) -TUXBOX_APPS_DIRECTORY_ONE(private_httpddir,PRIVATE_HTTPDDIR,datadir,/share,/tuxbox/neutrino/httpd, - [--with-private_httpddir=PATH ],[where to find the the private httpd files]) +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,/tuxbox/httpd, - [--with-public_httpddir=PATH ],[where to find the the public httpd files]) +TUXBOX_APPS_DIRECTORY_ONE(public_httpddir, PUBLIC_HTTPDDIR, localstatedir, /var, /tuxbox/httpd, + [--with-public_httpddir=PATH], [where to find the the public httpd files]) -TUXBOX_APPS_DIRECTORY_ONE(hosted_httpddir,HOSTED_HTTPDDIR,mntdir,/mnt,/hosted, - [--with-hosted_httpddir=PATH ],[where to find the the hosted files]) +TUXBOX_APPS_DIRECTORY_ONE(hosted_httpddir, HOSTED_HTTPDDIR, mntdir, /mnt, /hosted, + [--with-hosted_httpddir=PATH], [where to find the the hosted files]) -TUXBOX_APPS_DIRECTORY_ONE(flagdir,FLAGDIR,localstatedir,/var,/etc, - [--with-flagdir=PATH ],[where to find flagfiles]) +TUXBOX_APPS_DIRECTORY_ONE(flagdir, FLAGDIR, localstatedir, /var, /etc, + [--with-flagdir=PATH], [where to find flagfiles]) ]) dnl automake <= 1.6 needs this specifications From 5f614a3e14c2efe5048c12ab1a71cafe44ae7650 Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Sun, 10 Dec 2017 14:44:50 +0100 Subject: [PATCH 06/19] femanager.h increase max adapters to 4 Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/d50c5bfdcef8193f811a6dee7170ed81ba8031f7 Author: Jacek Jendrzej Date: 2017-12-10 (Sun, 10 Dec 2017) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/zapit/include/zapit/femanager.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/zapit/include/zapit/femanager.h b/src/zapit/include/zapit/femanager.h index 95e504b2e..10890d40d 100644 --- a/src/zapit/include/zapit/femanager.h +++ b/src/zapit/include/zapit/femanager.h @@ -32,7 +32,7 @@ #include #define MAX_FE 4 -#define MAX_ADAPTERS 1 +#define MAX_ADAPTERS 4 //#define DYNAMIC_DEMUX //#define MAKE_FE_KEY(adapter, number) ((adapter << 8) | (number & 0xFF)) From b06aaace0c6d752fd867f2bf79cc724e6a96b991 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sat, 9 Dec 2017 13:01:37 +0100 Subject: [PATCH 07/19] acinclude/configure: show defaults Signed-off-by: Thilo Graf Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/d12e43ce05bd45c1dc4db7e1dc511210104932b3 Author: vanhofen Date: 2017-12-09 (Sat, 09 Dec 2017) Origin message was: ------------------ - acinclude/configure: show defaults Signed-off-by: Thilo Graf ------------------ This commit was generated by Migit --- acinclude.m4 | 19 ++++++++----------- configure.ac | 46 +++++++++++++++++++++++----------------------- 2 files changed, 31 insertions(+), 34 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 6087f7448..0c7b3ed1b 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -15,13 +15,13 @@ AC_ARG_WITH(targetprefix, [TARGET_PREFIX=""]) AC_ARG_WITH(debug, - AS_HELP_STRING([--without-debug], [disable debugging code]), + AS_HELP_STRING([--without-debug], [disable debugging code @<:@default=no@:>@]), [DEBUG="$withval"], [DEBUG="yes"]) if test "$DEBUG" = "yes"; then DEBUG_CFLAGS="-g3 -ggdb" - AC_DEFINE(DEBUG, 1, [Enable debug messages]) + AC_DEFINE(DEBUG, 1, [enable debugging code]) fi AC_ARG_WITH(libcoolstream-static-dir, @@ -30,16 +30,13 @@ AC_ARG_WITH(libcoolstream-static-dir, [LIBCOOLSTREAM_STATIC_DIR=""]) AC_ARG_ENABLE(libcoolstream-static, - AS_HELP_STRING([--enable-libcoolstream-static], [libcoolstream static linked for testing])) + AS_HELP_STRING([--enable-libcoolstream-static], [libcoolstream static linked for testing @<:@default=no@:>@])) AM_CONDITIONAL(ENABLE_LIBCOOLSTREAM_STATIC, test "$enable_libcoolstream_static" = "yes") AC_ARG_ENABLE(reschange, - AS_HELP_STRING([--enable-reschange], [enable change the osd resolution (default for hd2 and hd51)])) - -AM_CONDITIONAL(ENABLE_RESCHANGE,test "$enable_reschange" = "yes") -if test "$enable_reschange" = "yes"; then - AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION, 1, [enable change the osd resolution]) -fi + AS_HELP_STRING([--enable-reschange], [enable change the osd resolution @<:@default for hd2 and hd51@:>@]), + AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION, 1, [enable change the osd resolution])) +AM_CONDITIONAL(ENABLE_RESCHANGE, test "$enable_reschange" = "yes") AC_MSG_CHECKING(target) @@ -403,9 +400,9 @@ if test "$BOXMODEL" = "hd1"; then AC_DEFINE(BOXMODEL_CS_HD1, 1, [coolstream hd1/neo/neo2/zee]) elif test "$BOXMODEL" = "hd2"; then AC_DEFINE(BOXMODEL_CS_HD2, 1, [coolstream tank/trinity/trinity v2/trinity duo/zee2/link]) - AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION,1,[enable change the osd resolution]) + AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION, 1, [enable change the osd resolution]) elif test "$BOXMODEL" = "hd51"; then - AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION,1,[enable change the osd resolution]) + AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION, 1, [enable change the osd resolution]) elif test "$BOXMODEL" = "raspi"; then AC_DEFINE(BOXMODEL_RASPI, 1, [Raspberry pi]) fi diff --git a/configure.ac b/configure.ac index 498529e15..1799b6fcd 100644 --- a/configure.ac +++ b/configure.ac @@ -36,7 +36,7 @@ else fi AC_ARG_ENABLE(ffmpegdec, - AS_HELP_STRING([--enable-ffmpegdec], [include ffmpeg decoder support]), + AS_HELP_STRING([--enable-ffmpegdec], [enable ffmpeg decoder support @<:@default=no@:>@]), ,[enable_ffmpegdec=no]) AM_CONDITIONAL(ENABLE_FFMPEGDEC,test "$enable_ffmpegdec" = "yes") @@ -47,12 +47,12 @@ fi if test x"$enable_ffmpegdec" != xyes; then AC_ARG_WITH(tremor, - AS_HELP_STRING([--with-tremor], [use libvorbisidec instead of libogg/libvorbis]), + AS_HELP_STRING([--with-tremor], [use libvorbisidec instead of libogg/libvorbis @<:@default=no@:>@]), [TREMOR="$withval"], [TREMOR=no]) AC_ARG_WITH(tremor-static, - AS_HELP_STRING([--with-tremor-static], [use statically linked libvorbisidec instead of libogg/libvorbis]), + AS_HELP_STRING([--with-tremor-static], [use statically linked libvorbisidec instead of libogg/libvorbis @<:@default=no@:>@]), [TREMOR_STATIC="$withval"], [TREMOR_STATIC=no]) @@ -153,29 +153,29 @@ fi TUXBOX_APPS_LIB_PKGCONFIG(SIGC,sigc++-2.0) AC_ARG_ENABLE(keyboard-no-rc, - AS_HELP_STRING([--enable-keyboard-no-rc], [enable keyboard control, disable rc control]), + AS_HELP_STRING([--enable-keyboard-no-rc], [enable keyboard control, disable rc control @<:@default=no@:>@]), AC_DEFINE(KEYBOARD_INSTEAD_OF_REMOTE_CONTROL, 1, [enable keyboard control, disable rc control])) AC_ARG_ENABLE(mdev, - AS_HELP_STRING([--enable-mdev], [disable broken neutrino mount hack, use with mdev]), - AC_DEFINE(ASSUME_MDEV, 1, [disable broken neutrino mount hack, use with mdev])) + AS_HELP_STRING([--enable-mdev], [use mdev instead of broken neutrino mount hack @<:@default=no@:>@]), + AC_DEFINE(ASSUME_MDEV, 1, [use mdev instead of broken neutrino mount hack])) AC_ARG_ENABLE(freesatepg, - AS_HELP_STRING([--enable-freesatepg], [enable Freesat EPG code (experimental)]), + AS_HELP_STRING([--enable-freesatepg], [enable Freesat EPG code @<:@default=no@:>@]), AC_DEFINE(ENABLE_FREESATEPG, 1, [enable Freesat EPG code])) AC_ARG_ENABLE(viasatepg, - AS_HELP_STRING([--enable-viasatepg], [enable ViaSat EPG code (experimental)]), + AS_HELP_STRING([--enable-viasatepg], [enable ViaSat EPG code @<:@default=no@:>@]), AC_DEFINE(ENABLE_VIASATEPG, 1, [enable ViaSat EPG code])) AC_ARG_ENABLE(fastscan, - AS_HELP_STRING([--enable-fastscan], [enable fastscan code]), + AS_HELP_STRING([--enable-fastscan], [enable fastscan code @<:@default=no@:>@]), AC_DEFINE(ENABLE_FASTSCAN, 1, [enable fastscan code])) AM_CONDITIONAL(ENABLE_FASTSCAN, test "$enable_fastscan" = "yes") AC_ARG_ENABLE(giflib, - AS_HELP_STRING([--enable-giflib], [use giflib instead of libungif]), + AS_HELP_STRING([--enable-giflib], [use giflib instead of libungif @<:@default=no@:>@]), ,[enable_giflib=no]) AM_CONDITIONAL(ENABLE_GIFLIB, test "$enable_giflib" = "yes") @@ -184,7 +184,7 @@ if test "$enable_giflib" = "yes"; then fi AC_ARG_ENABLE(pugixml, - AS_HELP_STRING([--enable-pugixml], [use pugixml instead of xmltree]), + AS_HELP_STRING([--enable-pugixml], [use pugixml instead of xmltree @<:@default=no@:>@]), ,[enable_pugixml=no]) AM_CONDITIONAL(USE_PUGIXML, test "$enable_pugixml" = "yes") @@ -193,30 +193,30 @@ if test "$enable_pugixml" = "yes"; then fi AC_ARG_ENABLE(flac, - AS_HELP_STRING([--enable-flac], [include FLAC support]), + AS_HELP_STRING([--enable-flac], [enable FLAC support @<:@default=no@:>@]), ,[enable_flac=no]) AM_CONDITIONAL(ENABLE_FLAC, test "$enable_flac" = "yes") if test "$enable_flac" = "yes"; then - AC_DEFINE(ENABLE_FLAC, 1, [include FLAC support]) + AC_DEFINE(ENABLE_FLAC, 1, [enable FLAC support]) fi AC_ARG_ENABLE(upnp, - AS_HELP_STRING([--disable-upnp], [disable UPNP support]), + AS_HELP_STRING([--disable-upnp], [disable UPNP support @<:@default=no@:>@]), ,[enable_upnp=yes]) AM_CONDITIONAL(ENABLE_UPNP, test "$enable_upnp" = "yes") if test "$enable_upnp" = "yes"; then - AC_DEFINE(ENABLE_UPNP, 1, [include UPNP support]) + AC_DEFINE(ENABLE_UPNP, 1, [enable UPNP support]) fi AC_ARG_ENABLE(extupdate, - AS_HELP_STRING([--enable-extupdate], [include extended update routine]), + AS_HELP_STRING([--enable-extupdate], [enable extended update routine @<:@default=no@:>@]), ,[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]) + AC_DEFINE(ENABLE_EXTUPDATE, 1, [enable extended update routine]) fi AC_ARG_WITH(stb-hal-includes, @@ -239,7 +239,7 @@ if test "$BOXTYPE" != coolstream; then fi AC_ARG_ENABLE(lua, - AS_HELP_STRING([--disable-lua], [disable Lua support]), + AS_HELP_STRING([--disable-lua], [disable Lua support @<:@default=no@:>@]), ,[enable_lua=yes]) AM_CONDITIONAL(ENABLE_LUA, test "$enable_lua" = "yes") @@ -257,23 +257,23 @@ AC_DEFINE(LUA_COMPAT_5_2, 1, [does not really belong in config.h, but is needed fi AC_ARG_ENABLE(cleanup, - AS_HELP_STRING([--enable-cleanup], [enable cleanup on exit]), + AS_HELP_STRING([--enable-cleanup], [enable cleanup on exit @<:@default=no@:>@]), AC_DEFINE(EXIT_CLEANUP, 1, [enable cleanup on exit])) AC_ARG_ENABLE(pip, - AS_HELP_STRING([--enable-pip], [enable picture in picture support]), + AS_HELP_STRING([--enable-pip], [enable picture in picture support @<:@default=no@:>@]), AC_DEFINE(ENABLE_PIP, 1, [enable picture in picture support])) AC_ARG_ENABLE(testing, - AS_HELP_STRING([--enable-testing], [include dev code parts for neutrino tests])) + AS_HELP_STRING([--enable-testing], [enable development code @<:@default=no@:>@])) AM_CONDITIONAL(ENABLE_TESTING, test "$enable_testing" = "yes") if test "$enable_testing" = "yes"; then - AC_DEFINE(ENABLE_TESTING, 1, [include dev code parts for neutrino tests - not recommended for general users!]) + AC_DEFINE(ENABLE_TESTING, 1, [enable development code]) fi AC_ARG_ENABLE(fribidi, - AS_HELP_STRING([--enable-fribidi], [enable fribidi support])) + AS_HELP_STRING([--enable-fribidi], [enable fribidi support @<:@default=no@:>@])) AM_CONDITIONAL(ENABLE_FRIBIDI, test "$enable_fribidi" = "yes") AS_IF([test "$enable_fribidi" = "yes"], From 6cf77ac27403249dd47361162ae61f129fc2f5c2 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sat, 9 Dec 2017 13:01:37 +0100 Subject: [PATCH 08/19] configure: unify and simplify some AC_ARG_ENABLE() calls Signed-off-by: Thilo Graf Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/7981682173605b102c516098798186012d66db12 Author: vanhofen Date: 2017-12-09 (Sat, 09 Dec 2017) Origin message was: ------------------ - configure: unify and simplify some AC_ARG_ENABLE() calls Signed-off-by: Thilo Graf ------------------ This commit was generated by Migit --- configure.ac | 47 ++++++++++------------------------------------- 1 file changed, 10 insertions(+), 37 deletions(-) diff --git a/configure.ac b/configure.ac index 1799b6fcd..dc18c08d7 100644 --- a/configure.ac +++ b/configure.ac @@ -37,12 +37,8 @@ fi AC_ARG_ENABLE(ffmpegdec, AS_HELP_STRING([--enable-ffmpegdec], [enable ffmpeg decoder support @<:@default=no@:>@]), - ,[enable_ffmpegdec=no]) - + AC_DEFINE(ENABLE_FFMPEGDEC, 1, [include ffmpeg decoder support])) 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 @@ -171,35 +167,22 @@ AC_ARG_ENABLE(viasatepg, AC_ARG_ENABLE(fastscan, AS_HELP_STRING([--enable-fastscan], [enable fastscan code @<:@default=no@:>@]), AC_DEFINE(ENABLE_FASTSCAN, 1, [enable fastscan code])) - AM_CONDITIONAL(ENABLE_FASTSCAN, test "$enable_fastscan" = "yes") AC_ARG_ENABLE(giflib, AS_HELP_STRING([--enable-giflib], [use giflib instead of libungif @<:@default=no@:>@]), - ,[enable_giflib=no]) - + AC_DEFINE(ENABLE_GIFLIB, 1, [use giflib instead of libungif])) AM_CONDITIONAL(ENABLE_GIFLIB, test "$enable_giflib" = "yes") -if test "$enable_giflib" = "yes"; then - AC_DEFINE(ENABLE_GIFLIB, 1, [use giflib instead of libungif]) -fi AC_ARG_ENABLE(pugixml, - AS_HELP_STRING([--enable-pugixml], [use pugixml instead of xmltree @<:@default=no@:>@]), - ,[enable_pugixml=no]) - + AS_HELP_STRING([--enable-pugixml], [use pugixml instead of xmltree @<:@default=no@:>@]), + AC_DEFINE(USE_PUGIXML, 1, [use pugixml instead of xmltree])) AM_CONDITIONAL(USE_PUGIXML, test "$enable_pugixml" = "yes") -if test "$enable_pugixml" = "yes"; then - AC_DEFINE(USE_PUGIXML, 1, [use pugixml instead of xmltree]) -fi AC_ARG_ENABLE(flac, AS_HELP_STRING([--enable-flac], [enable FLAC support @<:@default=no@:>@]), - ,[enable_flac=no]) - + AC_DEFINE(ENABLE_FLAC, 1, [enable FLAC support])) AM_CONDITIONAL(ENABLE_FLAC, test "$enable_flac" = "yes") -if test "$enable_flac" = "yes"; then - AC_DEFINE(ENABLE_FLAC, 1, [enable FLAC support]) -fi AC_ARG_ENABLE(upnp, AS_HELP_STRING([--disable-upnp], [disable UPNP support @<:@default=no@:>@]), @@ -212,12 +195,8 @@ fi AC_ARG_ENABLE(extupdate, AS_HELP_STRING([--enable-extupdate], [enable extended update routine @<:@default=no@:>@]), - ,[enable_extupdate=no]) - + AC_DEFINE(ENABLE_EXTUPDATE, 1, [enable extended update routine])) AM_CONDITIONAL(ENABLE_EXTUPDATE, test "$enable_extupdate" = "yes") -if test "$enable_extupdate" = "yes"; then - AC_DEFINE(ENABLE_EXTUPDATE, 1, [enable extended update routine]) -fi AC_ARG_WITH(stb-hal-includes, AS_HELP_STRING([--with-stb-hal-includes=PATH], [path for libstb-hal includes [[NONE]]]), @@ -265,20 +244,14 @@ AC_ARG_ENABLE(pip, AC_DEFINE(ENABLE_PIP, 1, [enable picture in picture support])) AC_ARG_ENABLE(testing, - AS_HELP_STRING([--enable-testing], [enable development code @<:@default=no@:>@])) - + AS_HELP_STRING([--enable-testing], [enable development code @<:@default=no@:>@]), + AC_DEFINE(ENABLE_TESTING, 1, [enable development code])) AM_CONDITIONAL(ENABLE_TESTING, test "$enable_testing" = "yes") -if test "$enable_testing" = "yes"; then - AC_DEFINE(ENABLE_TESTING, 1, [enable development code]) -fi AC_ARG_ENABLE(fribidi, - AS_HELP_STRING([--enable-fribidi], [enable fribidi support @<:@default=no@:>@])) - + AS_HELP_STRING([--enable-fribidi], [enable fribidi support @<:@default=no@:>@]), + AC_DEFINE(ENABLE_FRIBIDI, 1, [enable fribidi support])) AM_CONDITIONAL(ENABLE_FRIBIDI, test "$enable_fribidi" = "yes") -AS_IF([test "$enable_fribidi" = "yes"], - AC_DEFINE(ENABLE_FRIBIDI, 1, [enable fribidi support]) -) if test "$BOXTYPE" = "coolstream"; then if test -e ${srcdir}/lib/hardware/coolstream/hd1/libcoolstream/nevis_ir.h; then From 753bddc8516226556031bcf17d6a59c4f08d6bfd Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sat, 9 Dec 2017 13:01:37 +0100 Subject: [PATCH 09/19] acinclude: unify descriptions in TUXBOX_APPS_DIRECTORY_ONE() Signed-off-by: Thilo Graf Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/013c56274964829861839b89fe3d3f6623c671ef Author: vanhofen Date: 2017-12-09 (Sat, 09 Dec 2017) Origin message was: ------------------ - acinclude: unify descriptions in TUXBOX_APPS_DIRECTORY_ONE() Signed-off-by: Thilo Graf ------------------ This commit was generated by Migit --- acinclude.m4 | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 0c7b3ed1b..5d4b9a6ab 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -144,70 +144,70 @@ else fi TUXBOX_APPS_DIRECTORY_ONE(configdir, CONFIGDIR, localstatedir, /var, /tuxbox/config, - [--with-configdir=PATH], [where to find the config files]) + [--with-configdir=PATH], [where to find config files]) TUXBOX_APPS_DIRECTORY_ONE(datadir, DATADIR, datadir, /share, /tuxbox, - [--with-datadir=PATH], [where to find data]) + [--with-datadir=PATH], [where to find data files]) TUXBOX_APPS_DIRECTORY_ONE(fontdir, FONTDIR, datadir, /share, /fonts, - [--with-fontdir=PATH], [where to find the fonts]) + [--with-fontdir=PATH], [where to find fonts]) TUXBOX_APPS_DIRECTORY_ONE(fontdir_var, FONTDIR_VAR, localstatedir, /var, /tuxbox/fonts, - [--with-fontdir_var=PATH], [where to find the fonts in /var]) + [--with-fontdir_var=PATH], [where to find fonts in /var]) TUXBOX_APPS_DIRECTORY_ONE(gamesdir, GAMESDIR, localstatedir, /var, /tuxbox/games, - [--with-gamesdir=PATH], [where to find the games]) + [--with-gamesdir=PATH], [where to find games]) TUXBOX_APPS_DIRECTORY_ONE(libdir, LIBDIR, libdir, /lib, /tuxbox, - [--with-libdir=PATH], [where to find the internal libs]) + [--with-libdir=PATH], [where to find internal libs]) TUXBOX_APPS_DIRECTORY_ONE(plugindir, PLUGINDIR, libdir, /lib, /tuxbox/plugins, - [--with-plugindir=PATH], [where to find the plugins]) + [--with-plugindir=PATH], [where to find plugins]) TUXBOX_APPS_DIRECTORY_ONE(plugindir_var, PLUGINDIR_VAR, localstatedir, /var, /tuxbox/plugins, - [--with-plugindir_var=PATH], [where to find the plugins in /var]) + [--with-plugindir_var=PATH], [where to find plugins in /var]) TUXBOX_APPS_DIRECTORY_ONE(plugindir_mnt, PLUGINDIR_MNT, mntdir, /mnt, /plugins, - [--with-plugindir_mnt=PATH], [where to find the the extern plugins]) + [--with-plugindir_mnt=PATH], [where to find external plugins]) TUXBOX_APPS_DIRECTORY_ONE(luaplugindir, LUAPLUGINDIR, libdir, /lib, /tuxbox/luaplugins, [--with-luaplugindir=PATH], [where to find Lua plugins]) TUXBOX_APPS_DIRECTORY_ONE(webtvdir, WEBTVDIR, datadir, /share, /tuxbox/neutrino/webtv, - [--with-webtvdir=PATH], [where to find the webtv content]) + [--with-webtvdir=PATH], [where to find webtv content]) TUXBOX_APPS_DIRECTORY_ONE(webtvdir_var, WEBTVDIR_VAR, localstatedir, /var, /tuxbox/webtv, - [--with-webtvdir_var=PATH], [where to find the webtv content in /var]) + [--with-webtvdir_var=PATH], [where to find webtv content in /var]) TUXBOX_APPS_DIRECTORY_ONE(localedir, LOCALEDIR,datadir, /share, /tuxbox/neutrino/locale, - [--with-localedir=PATH], [where to find the locale]) + [--with-localedir=PATH], [where to find locale]) TUXBOX_APPS_DIRECTORY_ONE(localedir_var, LOCALEDIR_VAR, localstatedir, /var, /tuxbox/locale, - [--with-localedir_var=PATH], [where to find the locale in /var]) + [--with-localedir_var=PATH], [where to find locale in /var]) 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 themes]) TUXBOX_APPS_DIRECTORY_ONE(themesdir_var, THEMESDIR_VAR, localstatedir, /var, /tuxbox/themes, - [--with-themesdir_var=PATH], [where to find the themes in /var]) + [--with-themesdir_var=PATH], [where to find themes in /var]) TUXBOX_APPS_DIRECTORY_ONE(iconsdir, ICONSDIR, datadir, /share, /tuxbox/neutrino/icons, - [--with-iconsdir=PATH], [where to find the icons]) + [--with-iconsdir=PATH], [where to find icons]) TUXBOX_APPS_DIRECTORY_ONE(iconsdir_var, ICONSDIR_VAR, localstatedir, /var, /tuxbox/icons, - [--with-iconsdir_var=PATH], [where to find the icons in /var]) + [--with-iconsdir_var=PATH], [where to find icons in /var]) TUXBOX_APPS_DIRECTORY_ONE(private_httpddir, PRIVATE_HTTPDDIR, datadir, /share, /tuxbox/neutrino/httpd, - [--with-private_httpddir=PATH], [where to find the the private httpd files]) + [--with-private_httpddir=PATH], [where to find private httpd files]) TUXBOX_APPS_DIRECTORY_ONE(public_httpddir, PUBLIC_HTTPDDIR, localstatedir, /var, /tuxbox/httpd, - [--with-public_httpddir=PATH], [where to find the the public httpd files]) + [--with-public_httpddir=PATH], [where to find public httpd files]) TUXBOX_APPS_DIRECTORY_ONE(hosted_httpddir, HOSTED_HTTPDDIR, mntdir, /mnt, /hosted, - [--with-hosted_httpddir=PATH], [where to find the the hosted files]) + [--with-hosted_httpddir=PATH], [where to find hosted files]) TUXBOX_APPS_DIRECTORY_ONE(flagdir, FLAGDIR, localstatedir, /var, /etc, - [--with-flagdir=PATH], [where to find flagfiles]) + [--with-flagdir=PATH], [where to find flag files]) ]) dnl automake <= 1.6 needs this specifications From e44e487161cc5f41ef6bc74c709ffcbcd54b24cc Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sat, 9 Dec 2017 13:01:37 +0100 Subject: [PATCH 10/19] configure: invert --disable-upnp false logic to --enable-upnp true Signed-off-by: Thilo Graf Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/8d855a2d19a58577060a873cafb6155960b51514 Author: vanhofen Date: 2017-12-09 (Sat, 09 Dec 2017) Origin message was: ------------------ - configure: invert --disable-upnp false logic to --enable-upnp true Signed-off-by: Thilo Graf ------------------ This commit was generated by Migit --- configure.ac | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index dc18c08d7..c4f545aec 100644 --- a/configure.ac +++ b/configure.ac @@ -185,8 +185,9 @@ AC_ARG_ENABLE(flac, AM_CONDITIONAL(ENABLE_FLAC, test "$enable_flac" = "yes") AC_ARG_ENABLE(upnp, - AS_HELP_STRING([--disable-upnp], [disable UPNP support @<:@default=no@:>@]), - ,[enable_upnp=yes]) + AS_HELP_STRING([--enable-upnp], [enable UPNP support @<:@default=yes@:>@]), + [enable_upnp="$enableval"], + [enable_upnp="yes"]) AM_CONDITIONAL(ENABLE_UPNP, test "$enable_upnp" = "yes") if test "$enable_upnp" = "yes"; then From 27e4aa18aeb0b1f781a63b5796a201b233336ad0 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sat, 9 Dec 2017 13:01:37 +0100 Subject: [PATCH 11/19] configure: invert --disable-lua false logic to --enable-lua true Signed-off-by: Thilo Graf Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/12d132d66581da96966e8c54240cdc981f126bd0 Author: vanhofen Date: 2017-12-09 (Sat, 09 Dec 2017) Origin message was: ------------------ - configure: invert --disable-lua false logic to --enable-lua true Signed-off-by: Thilo Graf ------------------ This commit was generated by Migit --- configure.ac | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index c4f545aec..5d6da7f3e 100644 --- a/configure.ac +++ b/configure.ac @@ -219,8 +219,9 @@ if test "$BOXTYPE" != coolstream; then fi AC_ARG_ENABLE(lua, - AS_HELP_STRING([--disable-lua], [disable Lua support @<:@default=no@:>@]), - ,[enable_lua=yes]) + AS_HELP_STRING([--enable-lua], [enable Lua support @<:@default=yes@:>@]), + [enable_lua="$enableval"], + [enable_lua="yes"]) AM_CONDITIONAL(ENABLE_LUA, test "$enable_lua" = "yes") if test "$enable_lua" = "yes"; then From 1af2bbc774004bc0ece19d5ad9feccd86aa0d6ad Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sat, 9 Dec 2017 13:01:37 +0100 Subject: [PATCH 12/19] acinclude: use AS_HELP_STRING() for --with-boxmodel; ... i don't know any other way to get linefeeds in right-hand text Signed-off-by: Thilo Graf Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/892818b69fd67baf9acfdd97ef118ad5fdc48d41 Author: vanhofen Date: 2017-12-09 (Sat, 09 Dec 2017) Origin message was: ------------------ - acinclude: use AS_HELP_STRING() for --with-boxmodel; ... i don't know any other way to get linefeeds in right-hand text Signed-off-by: Thilo Graf ------------------ This commit was generated by Migit --- acinclude.m4 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 5d4b9a6ab..108af6e8b 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -83,7 +83,7 @@ AC_CANONICAL_BUILD AC_CANONICAL_HOST AC_SYS_LARGEFILE -check_path () { +check_path() { return $(perl -e "if(\"$1\"=~m#^/usr/(local/)?bin#){print \"0\"}else{print \"1\";}") } @@ -323,9 +323,9 @@ AC_ARG_WITH(boxtype, [BOXTYPE="coolstream"]) AC_ARG_WITH(boxmodel, - [ --with-boxmodel valid for coolstream: hd1, hd2 - valid for armbox: hd51 - valid for generic: raspi], + AS_HELP_STRING([--with-boxmodel], [valid for coolstream: hd1, hd2]) +AS_HELP_STRING([], [valid for armbox: hd51]) +AS_HELP_STRING([], [valid for generic: raspi]), [case "${withval}" in hd1|hd2) if test "$BOXTYPE" = "coolstream"; then From cddf5e8f07fedf0b07ba08d1adefb64bfebd8225 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sat, 9 Dec 2017 13:01:37 +0100 Subject: [PATCH 13/19] configure: move libstb-hal block down Signed-off-by: Thilo Graf Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/e57a8ebb98be45d29c34dc86b06a51f783006794 Author: vanhofen Date: 2017-12-09 (Sat, 09 Dec 2017) Origin message was: ------------------ - configure: move libstb-hal block down Signed-off-by: Thilo Graf ------------------ This commit was generated by Migit --- configure.ac | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/configure.ac b/configure.ac index 5d6da7f3e..b7f8311dc 100644 --- a/configure.ac +++ b/configure.ac @@ -199,25 +199,6 @@ AC_ARG_ENABLE(extupdate, AC_DEFINE(ENABLE_EXTUPDATE, 1, [enable extended update routine])) AM_CONDITIONAL(ENABLE_EXTUPDATE, test "$enable_extupdate" = "yes") -AC_ARG_WITH(stb-hal-includes, - AS_HELP_STRING([--with-stb-hal-includes=PATH], [path for libstb-hal includes [[NONE]]]), - [STB_HAL_INC="$withval"], - [STB_HAL_INC=""]) - -AC_ARG_WITH(stb-hal-build, - AS_HELP_STRING([--with-stb-hal-build=PATH], [path where libstb-hal is built [[NONE]]]), - [STB_HAL_LIB="-L$withval"], - [STB_HAL_LIB=""]) - -AM_CONDITIONAL(USE_STB_HAL, test "$BOXTYPE" != "coolstream") -if test "$BOXTYPE" != coolstream; then - AC_DEFINE(USE_STB_HAL, 1, [use libstb-hal]) - 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 - AC_ARG_ENABLE(lua, AS_HELP_STRING([--enable-lua], [enable Lua support @<:@default=yes@:>@]), [enable_lua="$enableval"], @@ -255,6 +236,25 @@ AC_ARG_ENABLE(fribidi, AC_DEFINE(ENABLE_FRIBIDI, 1, [enable fribidi support])) AM_CONDITIONAL(ENABLE_FRIBIDI, test "$enable_fribidi" = "yes") +AC_ARG_WITH(stb-hal-includes, + AS_HELP_STRING([--with-stb-hal-includes=PATH], [path for libstb-hal includes [[NONE]]]), + [STB_HAL_INC="$withval"], + [STB_HAL_INC=""]) + +AC_ARG_WITH(stb-hal-build, + AS_HELP_STRING([--with-stb-hal-build=PATH], [path where libstb-hal is built [[NONE]]]), + [STB_HAL_LIB="-L$withval"], + [STB_HAL_LIB=""]) + +AM_CONDITIONAL(USE_STB_HAL, test "$BOXTYPE" != "coolstream") +if test "$BOXTYPE" != coolstream; then + AC_DEFINE(USE_STB_HAL, 1, [use libstb-hal]) + 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 + if test "$BOXTYPE" = "coolstream"; then if test -e ${srcdir}/lib/hardware/coolstream/hd1/libcoolstream/nevis_ir.h; then AC_DEFINE(HAVE_COOLSTREAM_NEVIS_IR_H, 1, [Define to 1 if you have the header file.]) From a513629981b9ff1f2567825ec48ab45aeba51f76 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sat, 9 Dec 2017 13:01:37 +0100 Subject: [PATCH 14/19] configure: fix logic around libswresample Signed-off-by: Thilo Graf Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/af01615e7b339bf5529f70c36469b56205da9e44 Author: vanhofen Date: 2017-12-09 (Sat, 09 Dec 2017) Origin message was: ------------------ - configure: fix logic around libswresample Signed-off-by: Thilo Graf ------------------ This commit was generated by Migit --- configure.ac | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index b7f8311dc..022230b72 100644 --- a/configure.ac +++ b/configure.ac @@ -80,17 +80,17 @@ 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 +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 -AM_CONDITIONAL(USE_TREMOR, test "$TREMOR" = "yes") - # TUXBOX_APPS_LIB_PKGCONFIG(OPENSSL,openssl) TUXBOX_APPS_LIB_PKGCONFIG(CURL,libcurl) @@ -109,6 +109,7 @@ PKG_CHECK_MODULES([FREETYPE], [freetype2 >= 16.2.10], if test -z "$CURL_LIBS" -a -z "$CURL_CFLAGS"; then TUXBOX_APPS_LIB_CONFIG(CURL,curl-config) fi + # fallback to freetype-config (which is ugly for cross-compilation) if test -z "$FREETYPE_LIBS" -a -z "$FREETYPE_CFLAGS"; then TUXBOX_APPS_LIB_CONFIG(FREETYPE,freetype-config) From 2b65abccd1e5687f14a85de544263f976cb0a91d Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sat, 9 Dec 2017 13:01:37 +0100 Subject: [PATCH 15/19] acinclude/configure: some minor format changes; fix indentations Signed-off-by: Thilo Graf Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/28450dcca0ec7318b45594a61b057fda16d3107f Author: vanhofen Date: 2017-12-09 (Sat, 09 Dec 2017) Origin message was: ------------------ - acinclude/configure: some minor format changes; fix indentations Signed-off-by: Thilo Graf ------------------ This commit was generated by Migit --- acinclude.m4 | 69 ++++++++++++++++++++++++++-------------------------- configure.ac | 52 ++++++++++++++++++++------------------- 2 files changed, 61 insertions(+), 60 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 108af6e8b..4248dda31 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1,4 +1,4 @@ -AC_DEFUN([TUXBOX_APPS],[ +AC_DEFUN([TUXBOX_APPS], [ AM_CONFIG_HEADER(config.h) AM_MAINTAINER_MODE @@ -30,7 +30,7 @@ AC_ARG_WITH(libcoolstream-static-dir, [LIBCOOLSTREAM_STATIC_DIR=""]) AC_ARG_ENABLE(libcoolstream-static, - AS_HELP_STRING([--enable-libcoolstream-static], [libcoolstream static linked for testing @<:@default=no@:>@])) + AS_HELP_STRING([--enable-libcoolstream-static], [libcoolstream static linked for testing @<:@default=no@:>@])) AM_CONDITIONAL(ENABLE_LIBCOOLSTREAM_STATIC, test "$enable_libcoolstream_static" = "yes") AC_ARG_ENABLE(reschange, @@ -68,7 +68,7 @@ elif test "$TARGET" = "cdk"; then AC_MSG_ERROR([invalid prefix, you need to specify one in cdk mode]) fi if test "$TARGET_PREFIX" != "NONE"; then - AC_DEFINE_UNQUOTED(TARGET_PREFIX, "$TARGET_PREFIX",[The targets prefix]) + AC_DEFINE_UNQUOTED(TARGET_PREFIX, "$TARGET_PREFIX", [The targets prefix]) fi if test "$TARGET_PREFIX" = "NONE"; then AC_MSG_ERROR([invalid targetprefix, you need to specify one in cdk mode]) @@ -90,9 +90,8 @@ check_path() { ]) dnl expand nested ${foo}/bar -AC_DEFUN([TUXBOX_EXPAND_VARIABLE],[__$1="$2" +AC_DEFUN([TUXBOX_EXPAND_VARIABLE], [__$1="$2" for __CNT in false false false false true; do dnl max 5 levels of indirection - $1=`eval echo "$__$1"` echo ${$1} | grep -q '\$' || break # 'grep -q' is POSIX, exit if no $ in variable __$1="${$1}" @@ -100,7 +99,7 @@ AC_DEFUN([TUXBOX_EXPAND_VARIABLE],[__$1="$2" $__CNT && AC_MSG_ERROR([can't expand variable $1=$2]) dnl bail out if we did not expand ]) -AC_DEFUN([TUXBOX_APPS_DIRECTORY_ONE],[ +AC_DEFUN([TUXBOX_APPS_DIRECTORY_ONE], [ AC_ARG_WITH($1, AS_HELP_STRING([$6], [$7 [[PREFIX$4$5]]], [32], [79]), [ _$2=$withval if test "$TARGET" = "cdk"; then @@ -109,7 +108,7 @@ AC_ARG_WITH($1, AS_HELP_STRING([$6], [$7 [[PREFIX$4$5]]], [32], [79]), [ $2=$withval fi TARGET_$2=${$2} -],[ +], [ # RFC 1925: "you can always add another level of indirection..." TUXBOX_EXPAND_VARIABLE($2,"${$3}$5") if test "$TARGET" = "cdk"; then @@ -119,13 +118,12 @@ AC_ARG_WITH($1, AS_HELP_STRING([$6], [$7 [[PREFIX$4$5]]], [32], [79]), [ fi TARGET_$2=$_$2 ]) - dnl AC_SUBST($2) AC_DEFINE_UNQUOTED($2,"$_$2",$7) AC_SUBST(TARGET_$2) ]) -AC_DEFUN([TUXBOX_APPS_DIRECTORY],[ +AC_DEFUN([TUXBOX_APPS_DIRECTORY], [ AC_REQUIRE([TUXBOX_APPS]) if test "$TARGET" = "cdk"; then @@ -235,7 +233,7 @@ AC_SUBST(PUBLIC_HTTPDDIR) AC_SUBST(HOSTED_HTTPDDIR) dnl end workaround -AC_DEFUN([_TUXBOX_APPS_LIB_CONFIG],[ +AC_DEFUN([_TUXBOX_APPS_LIB_CONFIG], [ AC_PATH_PROG($1_CONFIG,$2,no) if test "$$1_CONFIG" != "no"; then if test "$TARGET" = "cdk" && check_path "$$1_CONFIG"; then @@ -255,23 +253,22 @@ if test "$$1_CONFIG" != "no"; then fi fi fi - AC_SUBST($1_CFLAGS) AC_SUBST($1_LIBS) ]) -AC_DEFUN([TUXBOX_APPS_LIB_CONFIG],[ +AC_DEFUN([TUXBOX_APPS_LIB_CONFIG], [ _TUXBOX_APPS_LIB_CONFIG($1,$2,ERROR) if test "$$1_CONFIG" = "no"; then AC_MSG_ERROR([could not find $2]); fi ]) -AC_DEFUN([TUXBOX_APPS_LIB_CONFIG_CHECK],[ +AC_DEFUN([TUXBOX_APPS_LIB_CONFIG_CHECK], [ _TUXBOX_APPS_LIB_CONFIG($1,$2,WARN) ]) -AC_DEFUN([TUXBOX_APPS_PKGCONFIG],[ +AC_DEFUN([TUXBOX_APPS_PKGCONFIG], [ m4_pattern_forbid([^_?PKG_[A-Z_]+$]) m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl @@ -283,7 +280,7 @@ if test x"$PKG_CONFIG" = x"" ; then fi ]) -AC_DEFUN([_TUXBOX_APPS_LIB_PKGCONFIG],[ +AC_DEFUN([_TUXBOX_APPS_LIB_PKGCONFIG], [ AC_REQUIRE([TUXBOX_APPS_PKGCONFIG]) AC_MSG_CHECKING(for package $2) if $PKG_CONFIG --exists "$2" ; then @@ -294,23 +291,22 @@ if $PKG_CONFIG --exists "$2" ; then else AC_MSG_RESULT(no) fi - AC_SUBST($1_CFLAGS) AC_SUBST($1_LIBS) ]) -AC_DEFUN([TUXBOX_APPS_LIB_PKGCONFIG],[ +AC_DEFUN([TUXBOX_APPS_LIB_PKGCONFIG], [ _TUXBOX_APPS_LIB_PKGCONFIG($1,$2) if test x"$$1_EXISTS" != xyes; then AC_MSG_ERROR([could not find package $2]); fi ]) -AC_DEFUN([TUXBOX_APPS_LIB_PKGCONFIG_CHECK],[ +AC_DEFUN([TUXBOX_APPS_LIB_PKGCONFIG_CHECK], [ _TUXBOX_APPS_LIB_PKGCONFIG($1,$2) ]) -AC_DEFUN([TUXBOX_BOXTYPE],[ +AC_DEFUN([TUXBOX_BOXTYPE], [ AC_ARG_WITH(boxtype, AS_HELP_STRING([--with-boxtype], [valid values: tripledragon, coolstream, spark, azbox, generic, armbox]), [case "${withval}" in @@ -376,10 +372,10 @@ AM_CONDITIONAL(BOXTYPE_SPARK, test "$BOXTYPE" = "spark") AM_CONDITIONAL(BOXTYPE_GENERIC, test "$BOXTYPE" = "generic") AM_CONDITIONAL(BOXTYPE_ARMBOX, test "$BOXTYPE" = "armbox") -AM_CONDITIONAL(BOXMODEL_CS_HD1,test "$BOXMODEL" = "hd1") -AM_CONDITIONAL(BOXMODEL_CS_HD2,test "$BOXMODEL" = "hd2") +AM_CONDITIONAL(BOXMODEL_CS_HD1, test "$BOXMODEL" = "hd1") +AM_CONDITIONAL(BOXMODEL_CS_HD2, test "$BOXMODEL" = "hd2") -AM_CONDITIONAL(BOXMODEL_RASPI,test "$BOXMODEL" = "raspi") +AM_CONDITIONAL(BOXMODEL_RASPI, test "$BOXMODEL" = "raspi") if test "$BOXTYPE" = "azbox"; then AC_DEFINE(HAVE_AZBOX_HARDWARE, 1, [building for an azbox]) @@ -404,28 +400,31 @@ elif test "$BOXMODEL" = "hd2"; then elif test "$BOXMODEL" = "hd51"; then AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION, 1, [enable change the osd resolution]) elif test "$BOXMODEL" = "raspi"; then - AC_DEFINE(BOXMODEL_RASPI, 1, [Raspberry pi]) + AC_DEFINE(BOXMODEL_RASPI, 1, [raspberry pi]) fi ]) dnl backward compatiblity -AC_DEFUN([AC_GNU_SOURCE], -[AH_VERBATIM([_GNU_SOURCE], -[/* Enable GNU extensions on systems that have them. */ +AC_DEFUN([AC_GNU_SOURCE], [ +AH_VERBATIM([_GNU_SOURCE], [ +/* Enable GNU extensions on systems that have them. */ #ifndef _GNU_SOURCE # undef _GNU_SOURCE -#endif])dnl +#endif +])dnl AC_BEFORE([$0], [AC_COMPILE_IFELSE])dnl AC_BEFORE([$0], [AC_RUN_IFELSE])dnl AC_DEFINE([_GNU_SOURCE]) ]) -AC_DEFUN([AC_PROG_EGREP], -[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep], - [if echo a | (grep -E '(a|b)') >/dev/null 2>&1 - then ac_cv_prog_egrep='grep -E' - else ac_cv_prog_egrep='egrep' - fi]) - EGREP=$ac_cv_prog_egrep - AC_SUBST([EGREP]) +AC_DEFUN([AC_PROG_EGREP], [ +AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep], [ +if echo a | (grep -E '(a|b)') >/dev/null 2>&1; then + ac_cv_prog_egrep='grep -E' +else + ac_cv_prog_egrep='egrep' +fi +]) +EGREP=$ac_cv_prog_egrep +AC_SUBST([EGREP]) ]) diff --git a/configure.ac b/configure.ac index 022230b72..d19fd4593 100644 --- a/configure.ac +++ b/configure.ac @@ -38,9 +38,9 @@ fi AC_ARG_ENABLE(ffmpegdec, AS_HELP_STRING([--enable-ffmpegdec], [enable ffmpeg decoder support @<:@default=no@:>@]), AC_DEFINE(ENABLE_FFMPEGDEC, 1, [include ffmpeg decoder support])) -AM_CONDITIONAL(ENABLE_FFMPEGDEC,test "$enable_ffmpegdec" = "yes") +AM_CONDITIONAL(ENABLE_FFMPEGDEC, test "$enable_ffmpegdec" = "yes") -if test x"$enable_ffmpegdec" != xyes; then +if test "$enable_ffmpegdec" != "yes"; then AC_ARG_WITH(tremor, AS_HELP_STRING([--with-tremor], [use libvorbisidec instead of libogg/libvorbis @<:@default=no@:>@]), @@ -131,9 +131,10 @@ TUXBOX_APPS_LIB_PKGCONFIG(PNG,libpng) TUXBOX_APPS_LIB_PKGCONFIG(AVFORMAT,libavformat) TUXBOX_APPS_LIB_PKGCONFIG(AVCODEC,libavcodec) TUXBOX_APPS_LIB_PKGCONFIG(AVUTIL,libavutil) +TUXBOX_APPS_LIB_PKGCONFIG(SIGC,sigc++-2.0) if test "$BOXTYPE" = "armbox"; then -TUXBOX_APPS_LIB_PKGCONFIG(SWSCALE,libswscale) + TUXBOX_APPS_LIB_PKGCONFIG(SWSCALE,libswscale) fi if test "$BOXTYPE" = "coolstream"; then @@ -147,8 +148,6 @@ if test "$BOXTYPE" = "coolstream" || AC_DEFINE(SCREENSHOT, 1, [Define to 1 if the platform supports screenshots]) fi -TUXBOX_APPS_LIB_PKGCONFIG(SIGC,sigc++-2.0) - AC_ARG_ENABLE(keyboard-no-rc, AS_HELP_STRING([--enable-keyboard-no-rc], [enable keyboard control, disable rc control @<:@default=no@:>@]), AC_DEFINE(KEYBOARD_INSTEAD_OF_REMOTE_CONTROL, 1, [enable keyboard control, disable rc control])) @@ -190,10 +189,10 @@ AC_ARG_ENABLE(upnp, [enable_upnp="$enableval"], [enable_upnp="yes"]) -AM_CONDITIONAL(ENABLE_UPNP, test "$enable_upnp" = "yes") if test "$enable_upnp" = "yes"; then AC_DEFINE(ENABLE_UPNP, 1, [enable UPNP support]) fi +AM_CONDITIONAL(ENABLE_UPNP, test "$enable_upnp" = "yes") AC_ARG_ENABLE(extupdate, AS_HELP_STRING([--enable-extupdate], [enable extended update routine @<:@default=no@:>@]), @@ -205,7 +204,6 @@ AC_ARG_ENABLE(lua, [enable_lua="$enableval"], [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", [ @@ -215,9 +213,10 @@ if test "$enable_lua" = "yes"; then 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+]) + # hack... + AC_DEFINE(LUA_COMPAT_5_2, 1, [does not really belong in config.h, but is needed for build with lua 5.3+]) fi +AM_CONDITIONAL(ENABLE_LUA, test "$enable_lua" = "yes") AC_ARG_ENABLE(cleanup, AS_HELP_STRING([--enable-cleanup], [enable cleanup on exit @<:@default=no@:>@]), @@ -247,7 +246,6 @@ AC_ARG_WITH(stb-hal-build, [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 @@ -255,24 +253,28 @@ if test "$BOXTYPE" != coolstream; then fi HWLIB_CFLAGS="-I$STB_HAL_INC" fi +AM_CONDITIONAL(USE_STB_HAL, test "$BOXTYPE" != "coolstream") if test "$BOXTYPE" = "coolstream"; then -if test -e ${srcdir}/lib/hardware/coolstream/hd1/libcoolstream/nevis_ir.h; then - AC_DEFINE(HAVE_COOLSTREAM_NEVIS_IR_H, 1, [Define to 1 if you have the header file.]) -fi -HWLIB_CFLAGS='-I$(top_srcdir)/lib/hardware/coolstream/hd1/libcoolstream' + if test "$BOXMODEL" = "hd1"; then + if test -e ${srcdir}/lib/hardware/coolstream/hd1/libcoolstream/nevis_ir.h; then + AC_DEFINE(HAVE_COOLSTREAM_NEVIS_IR_H, 1, [Define to 1 if you have the header file.]) + fi + HWLIB_CFLAGS='-I$(top_srcdir)/lib/hardware/coolstream/hd1/libcoolstream' + fi -if test "$BOXMODEL" = "hd2"; then -if test -e ${srcdir}/lib/hardware/coolstream/hd2/libcoolstream/cs_ir_generic.h; then - AC_DEFINE(HAVE_COOLSTREAM_CS_IR_GENERIC_H, 1, [Define to 1 if you have the header file.]) -fi -if test -e ${srcdir}/lib/hardware/coolstream/hd2/libcoolstream/cs_frontpanel.h; then - AC_DEFINE(HAVE_COOLSTREAM_CS_FRONTPANEL_H, 1, [Define to 1 if you have the header file.]) -fi -HWLIB_CFLAGS='-I$(top_srcdir)/lib/hardware/coolstream/hd2/libcoolstream' -fi -HWLIB_CFLAGS="$HWLIB_CFLAGS "'-I$(top_srcdir)/src/zapit/include/private' -HWLIB_CFLAGS="$HWLIB_CFLAGS "'-I$(top_srcdir)/lib/hardware/coolstream' + if test "$BOXMODEL" = "hd2"; then + if test -e ${srcdir}/lib/hardware/coolstream/hd2/libcoolstream/cs_ir_generic.h; then + AC_DEFINE(HAVE_COOLSTREAM_CS_IR_GENERIC_H, 1, [Define to 1 if you have the header file.]) + fi + if test -e ${srcdir}/lib/hardware/coolstream/hd2/libcoolstream/cs_frontpanel.h; then + AC_DEFINE(HAVE_COOLSTREAM_CS_FRONTPANEL_H, 1, [Define to 1 if you have the header file.]) + fi + HWLIB_CFLAGS='-I$(top_srcdir)/lib/hardware/coolstream/hd2/libcoolstream' + fi + + HWLIB_CFLAGS="$HWLIB_CFLAGS "'-I$(top_srcdir)/src/zapit/include/private' + HWLIB_CFLAGS="$HWLIB_CFLAGS "'-I$(top_srcdir)/lib/hardware/coolstream' fi # hack, so that framebuffer.h does not need to be included everywhere... From 51df1af5e81874b1281eff7968a16aef74fd16c6 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sat, 9 Dec 2017 13:01:37 +0100 Subject: [PATCH 16/19] acinclude/configure: some more minor format changes Signed-off-by: Thilo Graf Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/c091bd6fc94aef12e790b57792e0473001e530ff Author: vanhofen Date: 2017-12-09 (Sat, 09 Dec 2017) Origin message was: ------------------ - acinclude/configure: some more minor format changes Signed-off-by: Thilo Graf ------------------ This commit was generated by Migit --- acinclude.m4 | 18 ++++++++++-------- configure.ac | 49 ++++++++++++++++++++++++++----------------------- 2 files changed, 36 insertions(+), 31 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 4248dda31..d0daddef7 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -90,7 +90,8 @@ check_path() { ]) dnl expand nested ${foo}/bar -AC_DEFUN([TUXBOX_EXPAND_VARIABLE], [__$1="$2" +AC_DEFUN([TUXBOX_EXPAND_VARIABLE], [ + __$1="$2" for __CNT in false false false false true; do dnl max 5 levels of indirection $1=`eval echo "$__$1"` echo ${$1} | grep -q '\$' || break # 'grep -q' is POSIX, exit if no $ in variable @@ -312,9 +313,10 @@ AC_ARG_WITH(boxtype, [case "${withval}" in tripledragon|coolstream|spark|azbox|generic|armbox) BOXTYPE="$withval" - ;; + ;; *) - AC_MSG_ERROR([bad value $withval for --with-boxtype]) ;; + AC_MSG_ERROR([bad value $withval for --with-boxtype]) + ;; esac], [BOXTYPE="coolstream"]) @@ -329,7 +331,7 @@ AS_HELP_STRING([], [valid for generic: raspi]), else AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE]) fi - ;; + ;; nevis|apollo) if test "$BOXTYPE" = "coolstream"; then if test "$withval" = "nevis"; then @@ -341,24 +343,24 @@ AS_HELP_STRING([], [valid for generic: raspi]), else AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE]) fi - ;; + ;; hd51) if test "$BOXTYPE" = "armbox"; then BOXMODEL="$withval" else 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], [test "$BOXTYPE" = "coolstream" && BOXMODEL="hd1" || true]) diff --git a/configure.ac b/configure.ac index d19fd4593..a6a47e0d9 100644 --- a/configure.ac +++ b/configure.ac @@ -81,7 +81,7 @@ if test -z "$OGG_CFLAGS" ; then TUXBOX_APPS_LIB_PKGCONFIG(OGG,ogg) fi -fi +fi # test "$enable_ffmpegdec" TUXBOX_APPS_LIB_PKGCONFIG(SWRESAMPLE,libswresample) @@ -96,14 +96,12 @@ TUXBOX_APPS_LIB_PKGCONFIG(CURL,libcurl) ## For the check you must use the corresponding libtool number as version number, ## see freetype source code docs/VERSIONS.TXT -PKG_CHECK_MODULES([FREETYPE], [freetype2 >= 16.2.10], - [echo "freetype2 >= 2.5.0 found"], [ - ## If freetype is not found: - ## Activate this line if you want to search with freetype-config instead - [echo "freetype2 >= 2.5.0 not found, use alternative search method with freetype-config"] - ## Activate this line if you want to abort -# AC_MSG_ERROR([freetype2 >= 2.5.0 not found]) - ]) +PKG_CHECK_MODULES([FREETYPE], [freetype2 >= 16.2.10], [ + echo "freetype2 >= 2.5.0 found" +], [ + echo "freetype2 >= 2.5.0 not found, use alternative search method with freetype-config" + #AC_MSG_ERROR([freetype2 >= 2.5.0 not found]) +]) # fallback to curl-config (which is ugly for cross-compilation) if test -z "$CURL_LIBS" -a -z "$CURL_CFLAGS"; then @@ -115,16 +113,17 @@ if test -z "$FREETYPE_LIBS" -a -z "$FREETYPE_CFLAGS"; then TUXBOX_APPS_LIB_CONFIG(FREETYPE,freetype-config) CPPFLAGS+=" $FREETYPE_CFLAGS" AC_MSG_CHECKING([whether FreeType version is 2.5.0 or higher]) - AC_TRY_CPP([ - #include - #include FT_FREETYPE_H - #if FREETYPE_MAJOR < 2 || (FREETYPE_MAJOR == 2 && FREETYPE_MINOR < 5) - #error Freetype version too low. - #endif - ], - [AC_MSG_RESULT(yes)], - [AC_MSG_ERROR([Need FreeType library version 2.5.0 or higher]) - ]) + AC_TRY_CPP([ + #include + #include FT_FREETYPE_H + #if FREETYPE_MAJOR < 2 || (FREETYPE_MAJOR == 2 && FREETYPE_MINOR < 5) + #error Freetype version too low. + #endif + ], [ + AC_MSG_RESULT(yes) + ], [ + AC_MSG_ERROR([Need FreeType library version 2.5.0 or higher]) + ]) fi TUXBOX_APPS_LIB_PKGCONFIG(PNG,libpng) @@ -206,11 +205,15 @@ 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", [ - echo "=> lualib not found, assuming static lua in linker path..." + 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.]) + AC_DEFINE(STATIC_LUAPOSIX, 1, [Define to 1 for static lua build.]) ]) ]) # hack... From 9f71ed51b8cc5f394aa3552b36a26285351b04d4 Mon Sep 17 00:00:00 2001 From: TangoCash Date: Sat, 9 Dec 2017 20:51:29 +0100 Subject: [PATCH 17/19] fix bouquets freq handling for DVB-T/T2 Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/6f826c740c8b8aac2f07847fbd2fbdb0611c24f7 Author: TangoCash Date: 2017-12-09 (Sat, 09 Dec 2017) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/zapit/src/getservices.cpp | 9 +++++++-- src/zapit/src/scan.cpp | 12 +++++++++--- src/zapit/src/scannit.cpp | 4 ++-- 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/src/zapit/src/getservices.cpp b/src/zapit/src/getservices.cpp index e0382ff13..a64585252 100644 --- a/src/zapit/src/getservices.cpp +++ b/src/zapit/src/getservices.cpp @@ -444,7 +444,9 @@ void CServiceManager::ParseTransponders(xmlNodePtr node, t_satellite_position sa feparams.frequency = feparams.frequency/1000; //transponderlist was read from tuxbox } - freq_id_t freq = CREATE_FREQ_ID(feparams.frequency, !CFrontend::isSat(delsys)); + freq_id_t freq = CREATE_FREQ_ID(feparams.frequency, CFrontend::isCable(delsys)); + if (CFrontend::isTerr(delsys)) + freq = (freq_id_t) (feparams.frequency/(1000*1000)); transponder_id_t tid = CREATE_TRANSPONDER_ID64(freq, satellitePosition,original_network_id,transport_stream_id); transponder t(tid, feparams); @@ -767,7 +769,10 @@ void CServiceManager::ParseSatTransponders(delivery_system_t delsys, xmlNodePtr else /* we'll probably crash sooner or later, so write to STDERR... */ fprintf(stderr, "[getservices] %s: unknown delivery system %d!\n", __func__, delsys); - freq_id_t freq = CREATE_FREQ_ID(feparams.frequency, !CFrontend::isSat(delsys)); + freq_id_t freq = CREATE_FREQ_ID(feparams.frequency, CFrontend::isCable(delsys)); + if (CFrontend::isTerr(delsys)) + freq = (freq_id_t) (feparams.frequency/(1000*1000)); + feparams.polarization &= 7; transponder_id_t tid = CREATE_TRANSPONDER_ID64(freq, satellitePosition, fake_nid, fake_tid); diff --git a/src/zapit/src/scan.cpp b/src/zapit/src/scan.cpp index bba6e472f..1757d734f 100644 --- a/src/zapit/src/scan.cpp +++ b/src/zapit/src/scan.cpp @@ -286,7 +286,9 @@ _repeat: if(abort_scan) return false; - freq_id_t freq = CREATE_FREQ_ID(tI->second.feparams.frequency, !CFrontend::isSat(tI->second.feparams.delsys)); + freq_id_t freq = CREATE_FREQ_ID(tI->second.feparams.frequency, CFrontend::isCable(tI->second.feparams.delsys)); + if (CFrontend::isTerr(tI->second.feparams.delsys)) + freq = (freq_id_t) (tI->second.feparams.frequency/(1000*1000)); CNit nit(satellitePosition, freq, cable_nid); if(flags & SCAN_NIT) @@ -622,7 +624,9 @@ bool CServiceScan::ScanTransponder() printf("[scan] NIT %s, fta only: %s, satellites %s\n", flags & SCAN_NIT ? "yes" : "no", flags & SCAN_FTA ? "yes" : "no", scanProviders.size() == 1 ? "single" : "multi"); - freq_id_t freq = CREATE_FREQ_ID(TP->feparams.frequency, !CFrontend::isSat(TP->feparams.delsys)); + freq_id_t freq = CREATE_FREQ_ID(TP->feparams.frequency, CFrontend::isCable(TP->feparams.delsys)); + if (CFrontend::isTerr(TP->feparams.delsys)) + freq = (freq_id_t) (TP->feparams.frequency/(1000*1000)); fake_tid++; fake_nid++; @@ -669,7 +673,9 @@ bool CServiceScan::ReplaceTransponderParams(freq_id_t freq, t_satellite_position bool ret = false; for (transponder_list_t::iterator tI = transponders.begin(); tI != transponders.end(); ++tI) { if (tI->second.satellitePosition == satellitePosition) { - freq_id_t newfreq = CREATE_FREQ_ID(tI->second.feparams.frequency, !frontend->isSat()); + freq_id_t newfreq = CREATE_FREQ_ID(tI->second.feparams.frequency, frontend->isCable()); + if (frontend->isTerr()) + newfreq = (freq_id_t) (tI->second.feparams.frequency/(1000*1000)); if (freq == newfreq) { memcpy(&tI->second.feparams, feparams, sizeof(FrontendParameters)); printf("[scan] replacing transponder parameters\n"); diff --git a/src/zapit/src/scannit.cpp b/src/zapit/src/scannit.cpp index 4100cc926..7912fd2db 100644 --- a/src/zapit/src/scannit.cpp +++ b/src/zapit/src/scannit.cpp @@ -440,7 +440,7 @@ bool CNit::ParseTerrestrialDescriptor(TerrestrialDeliverySystemDescriptor * sd, if(feparams.frequency > 1000*1000) feparams.frequency /= 1000; - freq_id_t freq = CREATE_FREQ_ID(feparams.frequency, true); + freq_id_t freq = (freq_id_t) (feparams.frequency/(1000*1000)); transponder_id_t TsidOnid = CREATE_TRANSPONDER_ID64( freq, satellitePosition, tsinfo->getOriginalNetworkId(), tsinfo->getTransportStreamId()); @@ -471,7 +471,7 @@ bool CNit::ParseTerrestrial2Descriptor(T2DeliverySystemDescriptor * sd, Transpor for (T2FrequencyConstIterator T2freq = (*cell)->getCentreFrequencies()->begin(); T2freq != (*cell)->getCentreFrequencies()->end(); ++T2freq) { feparams.frequency = (*T2freq) * 10; - freq_id_t freq = CREATE_FREQ_ID(feparams.frequency, true); + freq_id_t freq = (freq_id_t) (feparams.frequency/(1000*1000)); transponder_id_t TsidOnid = CREATE_TRANSPONDER_ID64( freq, satellitePosition, tsinfo->getOriginalNetworkId(), tsinfo->getTransportStreamId()); From 81a09b8c649f4dd85b4776838ab00be31186d01e Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sat, 9 Dec 2017 23:21:14 +0100 Subject: [PATCH 18/19] webradio_usr.xml: add link to stompfm.de Signed-off-by: Thilo Graf Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/e11610bf323260cd7a70fd1d5b6fb0804957c064 Author: vanhofen Date: 2017-12-09 (Sat, 09 Dec 2017) Origin message was: ------------------ - webradio_usr.xml: add link to stompfm.de Signed-off-by: Thilo Graf ------------------ This commit was generated by Migit --- data/webradio_usr.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/data/webradio_usr.xml b/data/webradio_usr.xml index aa5a38857..2767fbe22 100644 --- a/data/webradio_usr.xml +++ b/data/webradio_usr.xml @@ -10,4 +10,5 @@ + From bd2fb8fb6bda37281dce06e84941cbde77cefc95 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Sun, 10 Dec 2017 19:54:07 +0100 Subject: [PATCH 19/19] CServiceManager: use value 0 as init value for feparams.plp_id Value of NO_STREAM_ID_FILTER = ~0U This could provokate overflow errors or possible compile errors related with compiler flags (e.g: -Werror=overflow) Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/1d0545e19c5630689ad4c2b09a7e03cf069cb22f Author: Thilo Graf Date: 2017-12-10 (Sun, 10 Dec 2017) ------------------ This commit was generated by Migit --- src/zapit/src/getservices.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/zapit/src/getservices.cpp b/src/zapit/src/getservices.cpp index a64585252..d4fe5fe3b 100644 --- a/src/zapit/src/getservices.cpp +++ b/src/zapit/src/getservices.cpp @@ -622,7 +622,7 @@ void CServiceManager::ParseSatTransponders(delivery_system_t delsys, xmlNodePtr feparams.frequency = xmlGetNumericAttribute(tps, "centre_frequency", 0); feparams.inversion = INVERSION_AUTO; - feparams.plp_id = NO_STREAM_ID_FILTER; + feparams.plp_id = 0; // NO_STREAM_ID_FILTER = ~0U, seems not suitable here feparams.pls_mode = PLS_Root; feparams.pls_code = 1;