diff --git a/config/functions b/config/functions index 1d57c71273..2a00460a5b 100644 --- a/config/functions +++ b/config/functions @@ -553,6 +553,7 @@ show_config() { config_message="$config_message\n - Remote support:\t\t\t $REMOTE_SUPPORT" config_message="$config_message\n - ATV Remote support:\t\t\t $ATVCLIENT_SUPPORT" config_message="$config_message\n - CEC Adapter support:\t\t\t $CEC_SUPPORT" + config_message="$config_message\n - CEC Framework support:\t\t\t $CEC_FRAMEWORK_SUPPORT" config_message="$config_message\n - Kodi Joystick support:\t\t $JOYSTICK_SUPPORT" # Misc. hardware configuration diff --git a/distributions/LibreELEC/options b/distributions/LibreELEC/options index 45d71871eb..5765813dfa 100644 --- a/distributions/LibreELEC/options +++ b/distributions/LibreELEC/options @@ -150,6 +150,9 @@ # build and install CEC adapter support (yes / no) CEC_SUPPORT="yes" +# build and install CEC framework support (yes / no) + CEC_FRAMEWORK_SUPPORT="no" + # build and install iSCSI support - iscsistart (yes / no) ISCSI_SUPPORT="yes" diff --git a/packages/sysutils/v4l-utils/package.mk b/packages/sysutils/v4l-utils/package.mk index c059116ebb..36fe8f7a20 100644 --- a/packages/sysutils/v4l-utils/package.mk +++ b/packages/sysutils/v4l-utils/package.mk @@ -35,14 +35,26 @@ PKG_AUTORECONF="no" PKG_CONFIGURE_OPTS_TARGET="--without-jpeg" +pre_configure_target() { + # cec-ctl fails to build in subdirs + cd $PKG_BUILD + rm -rf .$TARGET_NAME +} + make_target() { - make -C utils/keytable CFLAGS="$TARGET_CFLAGS" - make -C utils/ir-ctl CFLAGS="$TARGET_CFLAGS" + make -C utils/keytable CFLAGS="$TARGET_CFLAGS" + make -C utils/ir-ctl CFLAGS="$TARGET_CFLAGS" + if [ "$CEC_FRAMEWORK_SUPPORT" = "yes" ]; then + make -C utils/cec-ctl CFLAGS="$TARGET_CFLAGS" + fi } makeinstall_target() { - make install DESTDIR=$INSTALL PREFIX=/usr -C utils/keytable - make install DESTDIR=$INSTALL PREFIX=/usr -C utils/ir-ctl + make install DESTDIR=$INSTALL PREFIX=/usr -C utils/keytable + make install DESTDIR=$INSTALL PREFIX=/usr -C utils/ir-ctl + if [ "$CEC_FRAMEWORK_SUPPORT" = "yes" ]; then + make install DESTDIR=$INSTALL PREFIX=/usr -C utils/cec-ctl + fi } post_makeinstall_target() {