mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-26 15:02:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

configure: Rename hardware defined macros for coolstream stb

Browse Source 
BOXMODEL_NEVIS => BOXMODEL_CS_HD1
 configure parameter: --with-boxmodel=hd1
 --with-boxmodel=nevis is deprecated, but still valid

 BOXMODEL_APOLLO => BOXMODEL_CS_HD2
 configure parameter: --with-boxmodel=hd2
 --with-boxmodel=apollo is deprecated, but still valid


Origin commit data
------------------
Branch: ni/coolstream
Commit: bb2a848ae1
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-12 (Sun, 12 Feb 2017)

Origin message was:
------------------
configure: Rename hardware defined macros for coolstream stb

 BOXMODEL_NEVIS => BOXMODEL_CS_HD1
  configure parameter: --with-boxmodel=hd1
  --with-boxmodel=nevis is deprecated, but still valid

 BOXMODEL_APOLLO => BOXMODEL_CS_HD2
  configure parameter: --with-boxmodel=hd2
  --with-boxmodel=apollo is deprecated, but still valid


------------------
This commit was generated by Migit
This commit is contained in:
Michael Liebmann
2017-02-12 07:32:58 +01:00
parent d5bca0dec2
commit e8b36a1d80
5 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
acinclude.m4
View File

@@ -471,17 +471,29 @@ AC_ARG_WITH(boxtype,
esac], [BOXTYPE="coolstream"])
AC_ARG_WITH(boxmodel,
[ --with-boxmodel valid for coolstream: nevis, apollo
[ --with-boxmodel valid for coolstream: hd1, hd2
valid for dreambox: dm500, dm500plus, dm600pvr, dm56x0, dm7000, dm7020, dm7025
valid for ipbox: ip200, ip250, ip350, ip400],
[case "${withval}" in
nevis|apollo)
hd1|hd2)
if test "$BOXTYPE" = "coolstream"; then
BOXMODEL="$withval"
else
AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE])
fi
;;
nevis|apollo)
if test "$BOXTYPE" = "coolstream"; then
if test "$withval" = "nevis"; then
BOXMODEL="hd1"
fi
if test "$withval" = "apollo"; then
BOXMODEL="hd2"
fi
else
AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE])
fi
;;
dm500|dm500plus|dm600pvr|dm56x0|dm7000|dm7020|dm7025)
if test "$BOXTYPE" = "dreambox"; then
BOXMODEL="$withval"
@@ -499,7 +511,7 @@ AC_ARG_WITH(boxmodel,
*)
AC_MSG_ERROR([unsupported value $withval for --with-boxmodel])
;;
esac], [BOXMODEL="nevis"]
esac], [BOXMODEL="hd1"]
[if test "$BOXTYPE" = "dreambox" -o "$BOXTYPE" = "ipbox" && test -z "$BOXMODEL"; then
AC_MSG_ERROR([Dreambox/IPBox needs --with-boxmodel])
fi])
@@ -514,8 +526,8 @@ AM_CONDITIONAL(BOXTYPE_IPBOX, test "$BOXTYPE" = "ipbox")
AM_CONDITIONAL(BOXTYPE_COOL, test "$BOXTYPE" = "coolstream")
AM_CONDITIONAL(BOXTYPE_GENERIC, test "$BOXTYPE" = "generic")
AM_CONDITIONAL(BOXMODEL_NEVIS,test "$BOXMODEL" = "nevis")
AM_CONDITIONAL(BOXMODEL_APOLLO,test "$BOXMODEL" = "apollo")
AM_CONDITIONAL(BOXMODEL_CS_HD1,test "$BOXMODEL" = "hd1")
AM_CONDITIONAL(BOXMODEL_CS_HD2,test "$BOXMODEL" = "hd2")
AM_CONDITIONAL(BOXMODEL_DM500,test "$BOXMODEL" = "dm500")
AM_CONDITIONAL(BOXMODEL_DM500PLUS,test "$BOXMODEL" = "dm500plus")
@@ -543,10 +555,10 @@ elif test "$BOXTYPE" = "generic"; then
fi
# TODO: do we need more defines?
if test "$BOXMODEL" = "nevis"; then
AC_DEFINE(BOXMODEL_NEVIS, 1, [coolstream hd1/neo/neo2/zee])
elif test "$BOXMODEL" = "apollo"; then
AC_DEFINE(BOXMODEL_APOLLO, 1, [coolstream tank])
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/zee<65>/link])
elif test "$BOXMODEL" = "dm500"; then
AC_DEFINE(BOXMODEL_DM500, 1, [dreambox 500])
elif test "$BOXMODEL" = "ip200"; then

2
configure.ac
View File

@@ -245,7 +245,7 @@ if test -e ${srcdir}/lib/libcoolstream/nevis_ir.h; then
fi
HWLIB_CFLAGS='-I$(top_srcdir)/lib/libcoolstream -I$(top_srcdir)/src/zapit/include/private'
if test "$BOXMODEL" = "apollo"; then
if test "$BOXMODEL" = "hd2"; then
if test -e ${srcdir}/lib/libcoolstream2/cs_ir_generic.h; then
AC_DEFINE(HAVE_COOLSTREAM_CS_IR_GENERIC_H,1,[Define to 1 if you have the <cs_ir_generic.h> header file.])
fi

2
data/fonts/Makefile.am
View File

@@ -11,6 +11,6 @@ install_DATA = \
tuxtxt.ttf \
tuxtxt.otb
if BOXMODEL_APOLLO
if BOXMODEL_CS_HD2
install_DATA += UnDotum.ttf
endif

6
src/Makefile.am
View File

@@ -61,7 +61,7 @@ neutrino_SOURCES = neutrino_menue.cpp neutrino.cpp
AM_CPPFLAGS += -D_FILE_OFFSET_BITS=64
if BOXMODEL_APOLLO
if BOXMODEL_CS_HD2
MTDUTILSLIBS = \
system/mtdutils/libneutrino_system_mtdutils.a \
system/mtdutils/lib/libneutrino_system_mtdutils_lib.a
@@ -145,14 +145,14 @@ if BOXTYPE_COOL
neutrino_LDADD += -lcoolstream-mt -lca-sc
if ENABLE_TMSDK
else
if BOXMODEL_APOLLO
if BOXMODEL_CS_HD2
neutrino_LDADD += -lca-ci -llnxtmvssUsr -llnxUKAL -llnxplatUsr -llnxtmasUsr -llnxdvbciUsr -llnxpvrUsr -llnxcssUsr -llnxnotifyqUsr -ltmpvrDataManager-cst -ltmpvrIndexStorage -llnxscsUsr
else
neutrino_LDADD += -lnxp
endif
endif
if BOXMODEL_APOLLO
if BOXMODEL_CS_HD2
neutrino_LDADD += -liconv
endif

2
src/system/Makefile.am
View File

@@ -1,4 +1,4 @@
if BOXMODEL_APOLLO
if BOXMODEL_CS_HD2
SUBDIRS = mtdutils
endif