jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-30 14:46:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

package/tvheadend: bump version, add optional dependencies to opus & x265

Browse Source 
This bump
54e63e3f9a...303f418e1a
updated the transcoding support already present:
014bb9505e

To avoid these build errors

src/transcoding/codec/codecs/libs/libx26x.c:105:18: fatal error: x264.h: No such file or directory
 #include <x264.h>

src/transcoding/codec/codecs/libs/libx26x.c:213:18: fatal error: x265.h: No such file or directory
 #include <x265.h>

src/transcoding/codec/codecs/libs/libopus.c:23:31: fatal error: opus/opus_defines.h: No such file or directory
 #include <opus/opus_defines.h>

we need to add dependency handling already with this patch and keep the
hard dependency x264 as minimum codec for transcoding but we now need
to enable BR2_PACKAGE_FFMPEG_GPL to enable x264-support also in ffmpeg.

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
This commit is contained in:
Bernd Kuhls 2017-09-06 22:49:06 +02:00 committed by Arnout Vandecappelle (Essensium/Mind)
parent a9a14dc435
commit 7e0633439e
3 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package/tvheadend/Config.in
View File

@ -31,6 +31,7 @@ config BR2_PACKAGE_TVHEADEND_TRANSCODING
bool "transcoding support" bool "transcoding support"
select BR2_PACKAGE_FFMPEG select BR2_PACKAGE_FFMPEG
select BR2_PACKAGE_FFMPEG_AVRESAMPLE select BR2_PACKAGE_FFMPEG_AVRESAMPLE
select BR2_PACKAGE_FFMPEG_GPL # needed for x264 support
select BR2_PACKAGE_FFMPEG_SWSCALE select BR2_PACKAGE_FFMPEG_SWSCALE
select BR2_PACKAGE_LIBVPX if !BR2_bfin # libvpx select BR2_PACKAGE_LIBVPX if !BR2_bfin # libvpx
select BR2_PACKAGE_X264 select BR2_PACKAGE_X264

2
package/tvheadend/tvheadend.hash
View File

@ -1,2 +1,2 @@
# Locally computed # Locally computed
sha256 1994e379c798b118243e70f7fa38064a9b288d6e38b9ced0e8ad465f5d2e8fd9 tvheadend-54e63e3f9af8fdc0d23f61f3cda7fa7b246c1732.tar.gz sha256 00f67fbf9d8cfea7da90f469b36a8205fb9a38727c4cc5022f4ee5fd322459d3 tvheadend-303f418e1ac2bb3078f7a974b69f04ab6a56c636.tar.gz

24
package/tvheadend/tvheadend.mk
View File

@ -4,7 +4,7 @@
# #
################################################################################ ################################################################################
TVHEADEND_VERSION = 54e63e3f9af8fdc0d23f61f3cda7fa7b246c1732 TVHEADEND_VERSION = 303f418e1ac2bb3078f7a974b69f04ab6a56c636
TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION)) TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION))
TVHEADEND_LICENSE = GPL-3.0+ TVHEADEND_LICENSE = GPL-3.0+
TVHEADEND_LICENSE_FILES = LICENSE.md TVHEADEND_LICENSE_FILES = LICENSE.md
@ -27,10 +27,26 @@ TVHEADEND_CONF_OPTS += --disable-dbus-1
endif endif
ifeq ($(BR2_PACKAGE_TVHEADEND_TRANSCODING),y) ifeq ($(BR2_PACKAGE_TVHEADEND_TRANSCODING),y)
TVHEADEND_DEPENDENCIES += ffmpeg TVHEADEND_CONF_OPTS += --enable-libav --enable-libx264
TVHEADEND_CONF_OPTS += --enable-libav TVHEADEND_DEPENDENCIES += ffmpeg x264
ifeq ($(BR2_PACKAGE_OPUS),y)
TVHEADEND_CONF_OPTS += --enable-libopus
TVHEADEND_DEPENDENCIES += opus
else else
TVHEADEND_CONF_OPTS += --disable-libav TVHEADEND_CONF_OPTS += --disable-libopus
endif
ifeq ($(BR2_PACKAGE_X265),y)
TVHEADEND_CONF_OPTS += --enable-libx265
TVHEADEND_DEPENDENCIES += x265
else
TVHEADEND_CONF_OPTS += --disable-libx265
endif
else
TVHEADEND_CONF_OPTS += \
--disable-libav \
--disable-libopus \
--disable-libx264 \
--disable-libx265
endif endif
ifeq ($(BR2_PACKAGE_LIBDVBCSA),y) ifeq ($(BR2_PACKAGE_LIBDVBCSA),y)