| Message ID | 1413311309-30811-7-git-send-email-bernd.kuhls@t-online.de |
|---|---|
| State | Superseded |
| Headers | show |
Dear Bernd Kuhls, On Tue, 14 Oct 2014 20:28:29 +0200, Bernd Kuhls wrote: > ifeq ($(BR2_PACKAGE_LIBDVBCSA),y) > TVHEADEND_DEPENDENCIES += libdvbcsa > TVHEADEND_CONF_OPTS += --enable-dvbcsa > @@ -38,6 +45,7 @@ define TVHEADEND_CONFIGURE_CMDS > --python="$(HOST_DIR)/usr/bin/python" \ > --disable-dvbscan \ > --enable-bundle \ > + --disable-libffmpeg_static \ Maybe I haven't looked properly, but I don't see this option supported by tvheadend configure script. Can you check? Thanks, Thomas
[posted and mailed] Thomas Petazzoni <thomas.petazzoni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8 @public.gmane.org> wrote in news:20141028221104.35a56dd4@free-electrons.com: >> + --disable-libffmpeg_static \ > > Maybe I haven't looked properly, but I don't see this option supported > by tvheadend configure script. Can you check? Hi, you will find the option here: https://github.com/tvheadend/tvheadend/blob/master/configure#L36 Regards, Bernd
Dear Bernd Kuhls, On Wed, 29 Oct 2014 06:58:20 +0100, Bernd Kuhls wrote: > [posted and mailed] > > Thomas Petazzoni <thomas.petazzoni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8 > @public.gmane.org> wrote in news:20141028221104.35a56dd4@free-electrons.com: > > >> + --disable-libffmpeg_static \ > > > > Maybe I haven't looked properly, but I don't see this option supported > > by tvheadend configure script. Can you check? > > Hi, > > you will find the option here: > https://github.com/tvheadend/tvheadend/blob/master/configure#L36 Aah, yes, it's there. Presumably I was going at the tvheadend code prior to the recent bump. However, it's not clear to me what this option does, and therefore was is the impact on tvheadend. Also, the code: +ifeq ($(BR2_PACKAGE_FFMPEG_AVRESAMPLE)$(BR2_PACKAGE_FFMPEG_SWSCALE),yy) +TVHEADEND_DEPENDENCIES += ffmpeg +TVHEADEND_CONF_OPTS += --enable-libav +else +TVHEADEND_CONF_OPTS += --disable-libav +endif Means that the user needs to know that both the avresample and swscale suboptions of ffmpeg have to be enabled in order to have ffmpeg support in tvheadend. Not easy to know. Should we do something like: select BR2_PACKAGE_FFMPEG_AVRESAMPLE if BR2_PACKAGE_FFMPEG select BR2_PACKAGE_FFMPEG_SWSCALE if BR2_PACKAGE_FFMPEG in the tvheadend/Config.in file? This way the user would only have to enable BR2_PACKAGE_FFMPEG to get ffmpeg support in tvheadend. And the condition could be simplified to just test BR2_PACKAGE_FFMPEG. Best regards, Thomas
diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk index 8acf6af..357ba7d 100644 --- a/package/tvheadend/tvheadend.mk +++ b/package/tvheadend/tvheadend.mk @@ -14,6 +14,13 @@ ifeq ($(BR2_PACKAGE_AVAHI),y) TVHEADEND_DEPENDENCIES += avahi endif +ifeq ($(BR2_PACKAGE_FFMPEG_AVRESAMPLE)$(BR2_PACKAGE_FFMPEG_SWSCALE),yy) +TVHEADEND_DEPENDENCIES += ffmpeg +TVHEADEND_CONF_OPTS += --enable-libav +else +TVHEADEND_CONF_OPTS += --disable-libav +endif + ifeq ($(BR2_PACKAGE_LIBDVBCSA),y) TVHEADEND_DEPENDENCIES += libdvbcsa TVHEADEND_CONF_OPTS += --enable-dvbcsa @@ -38,6 +45,7 @@ define TVHEADEND_CONFIGURE_CMDS --python="$(HOST_DIR)/usr/bin/python" \ --disable-dvbscan \ --enable-bundle \ + --disable-libffmpeg_static \ $(TVHEADEND_CONF_OPTS) \ ) endef
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> --- v3: no changes v2: add --disable-libffmpeg_static, newly added option to git master package/tvheadend/tvheadend.mk | 8 ++++++++ 1 file changed, 8 insertions(+)