Merge pull request #1055 from CvH/tvh-up

Tvheadend update to 4.1.2401

packages/addons/addon-depends/dvb-tools-depends/dvb-apps/package.mk

@@ -30,12 +30,3 @@ PKG_SECTION="tools"
 PKG_SHORTDESC="Digitial Video Broadcasting (DVB) applications"
 PKG_LONGDESC="Applications and utilities geared towards the initial setup, testing and operation of an DVB device supporting the DVB-S, DVB-C, DVB-T, and ATSC standards."
 PKG_AUTORECONF="no"
-
-make_target() {
-  make -C lib
-  make -C util
-}
-
-makeinstall_target() {
-  : # nop
-}

packages/addons/service/tvheadend42/changelog.txt

@@ -1,3 +1,7 @@
+108
+- added CA (libdvben50221) support
+- update to Tvheadend 4.1.2401
+
 107
 - rebuild due ssl change
 

packages/addons/service/tvheadend42/package.mk

@@ -17,15 +17,15 @@
 ################################################################################
 
 PKG_NAME="tvheadend42"
-PKG_VERSION="0736ebc"
-PKG_VERSION_NUMBER="4.1.2309"
-PKG_REV="107"
+PKG_VERSION="1f894a6"
+PKG_VERSION_NUMBER="4.1.2401"
+PKG_REV="108"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.tvheadend.org"
 PKG_URL="https://github.com/tvheadend/tvheadend/archive/$PKG_VERSION.tar.gz"
 PKG_SOURCE_DIR="tvheadend-${PKG_VERSION}*"
-PKG_DEPENDS_TARGET="toolchain curl libdvbcsa libiconv libressl Python:host yasm"
+PKG_DEPENDS_TARGET="toolchain curl dvb-tools libdvbcsa libiconv libressl Python:host yasm"
 PKG_SECTION="service"
 PKG_SHORTDESC="Tvheadend: a TV streaming server for Linux"
 PKG_LONGDESC="Tvheadend ($PKG_VERSION_NUMBER): is a TV streaming server for Linux supporting DVB-S/S2, DVB-C, DVB-T/T2, IPTV, SAT>IP, ATSC and ISDB-T"
@@ -51,7 +51,7 @@ PKG_CONFIGURE_OPTS_TARGET="--prefix=/usr \
                            --enable-bundle \
                            --disable-dbus_1 \
                            --enable-dvbcsa \
-                           --disable-dvben50221 \
+                           --enable-dvben50221 \
                            --enable-hdhomerun_client \
                            --enable-hdhomerun_static \
                            --enable-epoll \
@@ -66,7 +66,7 @@ PKG_CONFIGURE_OPTS_TARGET="--prefix=/usr \
                            --python=$ROOT/$TOOLCHAIN/bin/python"
 
 post_unpack() {
-  sed -e 's/VER="0.0.0~unknown"/VER="'$PKG_VERSION_NUMBER' ~ LibreELEC Tvh-addon v'$PKG_ADDON_REPOVERSION'.'$PKG_REV'"/g' -i $PKG_BUILD/support/version
+  sed -e 's/VER="0.0.0~unknown"/VER="'$PKG_VERSION_NUMBER' ~ LibreELEC Tvh-addon v'$ADDON_VERSION'.'$PKG_REV'"/g' -i $PKG_BUILD/support/version
 }
 
 pre_configure_target() {

packages/addons/service/tvheadend42/patches/tvheadend42-03_gcc6.patch

@@ -1,12 +0,0 @@
-diff -Naur a/Makefile.ffmpeg b/Makefile.ffmpeg
---- a/Makefile.ffmpeg	2016-08-23 22:33:53.857013081 +0100
-+++ b/Makefile.ffmpeg	2016-08-23 22:35:03.249419823 +0100
-@@ -446,7 +446,7 @@
- $(LIB_ROOT)/$(LIBFDKAAC)/.tvh_build: \
- 		$(LIB_ROOT)/$(LIBFDKAAC)/.tvh_download
- 	cd $(LIB_ROOT)/$(LIBFDKAAC) && \
--		CXXFLAGS="$(CFLAGS_PI)" CFLAGS="$(CFLAGS_PI)" $(CONFIGURE)
-+		CXXFLAGS="$(CFLAGS_PI) -Wno-narrowing" CFLAGS="$(CFLAGS_PI)" $(CONFIGURE)
- 	DESTDIR=$(EBUILDIR) \
- 		$(MAKE) -C $(LIB_ROOT)/$(LIBFDKAAC) install
- 	@touch $@

packages/addons/service/tvheadend42/source/bin/tvheadend42.start

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ################################################################################
-#      This file is part of LibreELEC - https://LibreELEC.tv
+#      This file is part of LibreELEC - https://libreelec.tv
 #      Copyright (C) 2016 Team LibreELEC
 #
 #  LibreELEC is free software: you can redistribute it and/or modify