From c6a7c5e233447a7a1613796b2b7eb09261542c31 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sat, 29 Oct 2022 00:23:17 +0200 Subject: [PATCH] add E4HD Ultra Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/7a1a236fa6112173587a7c5398b3a7be5a0c3454 Author: vanhofen Date: 2022-10-29 (Sat, 29 Oct 2022) Origin message was: ------------------ - add E4HD Ultra ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- acinclude.m4 | 9 ++++++--- configure.ac | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index b19fbb943..0fa659ef9 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -470,7 +470,7 @@ AC_ARG_WITH(boxtype, AC_ARG_WITH(boxmodel, AS_HELP_STRING([--with-boxmodel], [valid for generic: generic, raspi]) AS_HELP_STRING([], [valid for coolstream: hd1, hd2]) -AS_HELP_STRING([], [valid for armbox: hd60, hd61, multibox, multiboxse, hd51, bre2ze4k, h7, osmini4k, osmio4k, osmio4kplus, vusolo4k, vuduo4k, vuduo4kse, vuultimo4k, vuuno4k, vuuno4kse, vuzero4k]) +AS_HELP_STRING([], [valid for armbox: hd60, hd61, multibox, multiboxse, hd51, bre2ze4k, h7, e4hdultra, osmini4k, osmio4k, osmio4kplus, vusolo4k, vuduo4k, vuduo4kse, vuultimo4k, vuuno4k, vuuno4kse, vuzero4k]) AS_HELP_STRING([], [valid for mipsbox: vuduo, vuduo2]), [case "${withval}" in generic|raspi) @@ -499,7 +499,7 @@ AS_HELP_STRING([], [valid for mipsbox: vuduo, vuduo2]), AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE]) fi ;; - hd60|hd61|multibox|multiboxse|hd51|bre2ze4k|h7|osmini4k|osmio4k|osmio4kplus|vusolo4k|vuduo4k|vuduo4kse|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k) + hd60|hd61|multibox|multiboxse|hd51|bre2ze4k|h7|e4hdultra|osmini4k|osmio4k|osmio4kplus|vusolo4k|vuduo4k|vuduo4kse|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k) if test "$BOXTYPE" = "armbox"; then BOXMODEL="$withval" else @@ -544,6 +544,7 @@ AM_CONDITIONAL(BOXMODEL_MULTIBOXSE, test "$BOXMODEL" = "multiboxse") AM_CONDITIONAL(BOXMODEL_HD51, test "$BOXMODEL" = "hd51") AM_CONDITIONAL(BOXMODEL_BRE2ZE4K, test "$BOXMODEL" = "bre2ze4k") AM_CONDITIONAL(BOXMODEL_H7, test "$BOXMODEL" = "h7") +AM_CONDITIONAL(BOXMODEL_E4HDULTRA, test "$BOXMODEL" = "e4hdultra") AM_CONDITIONAL(BOXMODEL_OSMINI4K, test "$BOXMODEL" = "osmini4k") AM_CONDITIONAL(BOXMODEL_OSMIO4K, test "$BOXMODEL" = "osmio4k") @@ -617,6 +618,8 @@ elif test "$BOXMODEL" = "bre2ze4k"; then AC_DEFINE(BOXMODEL_BRE2ZE4K, 1, [bre2ze4k]) elif test "$BOXMODEL" = "h7"; then AC_DEFINE(BOXMODEL_H7, 1, [h7]) +elif test "$BOXMODEL" = "e4hdultra"; then + AC_DEFINE(BOXMODEL_E4HDULTRA, 1, [e4hdultra]) elif test "$BOXMODEL" = "osmini4k"; then AC_DEFINE(BOXMODEL_OSMINI4K, 1, [osmini4k]) @@ -707,7 +710,7 @@ AM_CONDITIONAL(BOXMODEL_HISILICON, test "$hisilicon" = "true") # BOXMODELs that allows to change osd resolution case "$BOXMODEL" in - hd2|hd60|hd61|multibox|multiboxse|hd51|bre2ze4k|h7|osmini4k|osmio4k|osmio4kplus|vusolo4k|vuduo4k|vuduo4kse|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k|vuduo|vuduo2|gb800se|osnino|osninoplus|osninopro) + hd2|hd60|hd61|multibox|multiboxse|hd51|bre2ze4k|h7|e4hdultra|osmini4k|osmio4k|osmio4kplus|vusolo4k|vuduo4k|vuduo4kse|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k|vuduo|vuduo2|gb800se|osnino|osninoplus|osninopro) AC_DEFINE(ENABLE_CHANGE_OSD_RESOLUTION, 1, [enable to change osd resolution]) ;; esac diff --git a/configure.ac b/configure.ac index 24629262d..119b4897d 100644 --- a/configure.ac +++ b/configure.ac @@ -306,7 +306,7 @@ AC_ARG_ENABLE(pip, AM_CONDITIONAL(ENABLE_PIP, test "$enable_pip" = "yes") case "$BOXMODEL" in - vusolo4k|vuduo4k|vuduo4kse|vuultimo4k|vuuno4k|vuuno4kse) + vusolo4k|vuduo4k|vuduo4kse|vuultimo4k|vuuno4k|vuuno4kse|e4hdultra) AC_ARG_ENABLE(quadpip, AS_HELP_STRING([--enable-quadpip], [enable quad picture in picture support @<:@default=no@:>@]), AC_DEFINE(ENABLE_QUADPIP, 1, [enable quad picture in picture support]))