package/tvheadend: add option to en-/disable transcoding support

https://github.com/tvheadend/tvheadend/commit/014bb9505e1d7eb6e37e10931dd89ab3b1a0dc01
extended the already present transcoding support and included vaapi-
accelerated transcoding.

In order to support these new options and their numerous dependencies
we add a new Kconfig option for transcoding support to allow users to
disable transcoding support, because they use tvheadend for recording
or by its internal hts protocol, for example with the kodi-pvr-hts
addon.

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>

diff --git a/package/tvheadend/Config.in b/package/tvheadend/Config.in
index fc39d6f486475b1233887d02185bb37818776def..191593eab33325540decaf0c2b66c0de5478334d 100644 (file)
--- a/package/tvheadend/Config.in
+++ b/package/tvheadend/Config.in
@@ -10,10 +10,6 @@ config BR2_PACKAGE_TVHEADEND
        depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2
        depends on BR2_TOOLCHAIN_HAS_SYNC_4
        select BR2_PACKAGE_DTV_SCAN_TABLES
-       select BR2_PACKAGE_FFMPEG_AVRESAMPLE if BR2_PACKAGE_FFMPEG
-       select BR2_PACKAGE_FFMPEG_SWSCALE if BR2_PACKAGE_FFMPEG
-       select BR2_PACKAGE_LIBVPX if BR2_PACKAGE_FFMPEG && !BR2_bfin # libvpx
-       select BR2_PACKAGE_X264 if BR2_PACKAGE_FFMPEG
        select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
        select BR2_PACKAGE_OPENSSL
        help
@@ -28,3 +24,17 @@ config BR2_PACKAGE_TVHEADEND
              is available on port 9981.
            - if you want Avahi support, you'll need to enable:
                  Avahi, D-Bus, libdaemon
+
+if BR2_PACKAGE_TVHEADEND
+
+config BR2_PACKAGE_TVHEADEND_TRANSCODING
+       bool "transcoding support"
+       select BR2_PACKAGE_FFMPEG
+       select BR2_PACKAGE_FFMPEG_AVRESAMPLE
+       select BR2_PACKAGE_FFMPEG_SWSCALE
+       select BR2_PACKAGE_LIBVPX if !BR2_bfin # libvpx
+       select BR2_PACKAGE_X264
+       help
+         Enable transcoding support.
+
+endif

diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk
index 6c0eb63752b8fb0c8fd9411f930ce1099e39b33e..b1c1fcaf78e5f3615246451ce061958514187a12 100644 (file)
--- a/package/tvheadend/tvheadend.mk
+++ b/package/tvheadend/tvheadend.mk
@@ -26,7 +26,7 @@ else
 TVHEADEND_CONF_OPTS += --disable-dbus-1
 endif
 
-ifeq ($(BR2_PACKAGE_FFMPEG),y)
+ifeq ($(BR2_PACKAGE_TVHEADEND_TRANSCODING),y)
 TVHEADEND_DEPENDENCIES += ffmpeg
 TVHEADEND_CONF_OPTS += --enable-libav
 else