瀏覽代碼

package/tvheadend: add option to enable IPTV support

Some IPTV streams will need ffmpef, the command line tool), while some
won't, so we just suggest that to the user in the help text.

There were two alternatives, but neither were very convincing:
  - always enforce that ffmpeg is enabled
  - only enforce ffmpeg to be enabled when the package is already
    enabled

In either case, that may cary the ffmpeg tool when it really is not
needed. So leave it to the user to decide whether they want it or not.

tvheadend now has a bunch of options, so make it a sub-menu.

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
[yann.morin.1998@free.fr:
  - do not forcibly enable ffmpeg-the-commandline-tool
  - one option per-commit
]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Bernd Kuhls 4 年之前
父節點
當前提交
428277b03e
共有 2 個文件被更改,包括 19 次插入1 次删除
  1. 13 1
      package/tvheadend/Config.in
  2. 6 0
      package/tvheadend/tvheadend.mk

+ 13 - 1
package/tvheadend/Config.in

@@ -3,7 +3,7 @@ comment "tvheadend needs a toolchain w/ NPTL, headers >= 3.2, dynamic library"
 		!BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2 || BR2_STATIC_LIBS
 		!BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2 || BR2_STATIC_LIBS
 	depends on BR2_TOOLCHAIN_HAS_SYNC_4
 	depends on BR2_TOOLCHAIN_HAS_SYNC_4
 
 
-config BR2_PACKAGE_TVHEADEND
+menuconfig BR2_PACKAGE_TVHEADEND
 	bool "tvheadend"
 	bool "tvheadend"
 	depends on !BR2_STATIC_LIBS # dladdr()
 	depends on !BR2_STATIC_LIBS # dladdr()
 	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
 	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
@@ -34,6 +34,18 @@ config BR2_PACKAGE_TVHEADEND_DESCRAMBLER
 	help
 	help
 	  Enable support for various descrambler modules.
 	  Enable support for various descrambler modules.
 
 
+config BR2_PACKAGE_TVHEADEND_IPTV
+	bool "IPTV support"
+	default y
+	help
+	  Enable IPTV support.
+
+	  Note that some IPTV streams will need to be piped through
+	  ffmpeg (the commandline tool), so you may have to enable it
+	  with:
+	    BR2_PACKAGE_FFMPEG=y
+	    BR2_PACKAGE_FFMPEG_FFMPEG=y
+
 config BR2_PACKAGE_TVHEADEND_SATIP
 config BR2_PACKAGE_TVHEADEND_SATIP
 	bool "SAT>IP support"
 	bool "SAT>IP support"
 	default y
 	default y

+ 6 - 0
package/tvheadend/tvheadend.mk

@@ -79,6 +79,12 @@ TVHEADEND_CONF_OPTS += \
 	--disable-constcw
 	--disable-constcw
 endif
 endif
 
 
+ifeq ($(BR2_PACKAGE_TVHEADEND_IPTV),y)
+TVHEADEND_CONF_OPTS += --enable-iptv
+else
+TVHEADEND_CONF_OPTS += --disable-iptv
+endif
+
 ifeq ($(BR2_PACKAGE_TVHEADEND_SATIP),y)
 ifeq ($(BR2_PACKAGE_TVHEADEND_SATIP),y)
 TVHEADEND_CONF_OPTS += --enable-satip_client --enable-satip_server
 TVHEADEND_CONF_OPTS += --enable-satip_client --enable-satip_server
 else
 else