TVH update (#4686)

* tvheadend: Update to latest comit

* tvheadend: Add updated dtv-scan-tables

* tvheadend: Remove empty service_preupgrade causing error

On DSM6 the empty service_preupgrade() was causing:
2021/06/19 06:24:46	upgrade tvheadend 4.3.20210612-27 Begin postuninst
/var/packages/tvheadend/scripts/service-setup: line 70: syntax error near unexpected token `}'
/var/packages/tvheadend/scripts/service-setup: line 70: `}
Removing it solved the issue

* tvheadend: Enforce python3 as not default system-wide

* libhdhomerun: Update from version 20200521 to 20210224

* tvheadend: Update release description

Co-authored-by: hgy59 <hpgy59@gmail.com>

cross/dtv-scan-tables/Makefile

@@ -0,0 +1,21 @@
+PKG_NAME = dtv-scan-tables
+PKG_VERS = na
+PKG_EXT = tar.gz
+PKG_DIST_NAME = master.$(PKG_EXT)
+PKG_DIST_SITE = https://github.com/crazycat69/dtv-scan-tables/archive
+PKG_DIST_FILE = $(PKG_NAME).$(PKG_EXT)
+PKG_DIR = $(PKG_NAME)-master
+
+DEPENDS =
+
+INSTALL_TARGET = dtv_scan_tables_install
+
+HOMEPAGE = https://github.com/crazycat69/dtv-scan-tables
+COMMENT  = Digital TV scan tables
+LICENSE  = GPLv2
+
+include ../../mk/spksrc.install-resources.mk
+
+.PHONY: dtv_scan_tables_install
+dtv_scan_tables_install:
+	$(RUN) DATADIR=$(INSTALL_DIR)/$(INSTALL_PREFIX)/share/tvheadend/data DVBV5DIR=dvb-scan $(MAKE) install

cross/dtv-scan-tables/digests

@@ -0,0 +1,3 @@
+dtv-scan-tables.tar.gz SHA1 92b2b302cb6c93c56c59f5bd69407631f8ce3a92
+dtv-scan-tables.tar.gz SHA256 bebba3a24048f28916be65ef896f43c0e651f2a2e44e548a3b6a6236584158e7
+dtv-scan-tables.tar.gz MD5 bddb3a892294ac3a2d05aaacc9cfa442

cross/libhdhomerun/Makefile

@@ -1,5 +1,5 @@
 PKG_NAME = libhdhomerun
-PKG_VERS = 20200521
+PKG_VERS = 20210224
 PKG_EXT = tgz
 PKG_DIST_NAME = $(PKG_NAME)_$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://download.silicondust.com/hdhomerun

cross/libhdhomerun/digests

@@ -1,3 +1,3 @@
-libhdhomerun_20200521.tgz SHA1 8524464d4a005dbe7265dc544c025d63a18b32bd
-libhdhomerun_20200521.tgz SHA256 a61038f0a78c5dcab3508927ba47ac6ec47840f3d42a2df2b02034cfd7400668
-libhdhomerun_20200521.tgz MD5 25079693178cc5fd0724f5518bf474a2
+libhdhomerun_20210224.tgz SHA1 053d1aed34d9ed22738de9064e030b4f1702178f
+libhdhomerun_20210224.tgz SHA256 b996389aa6f124a6d9dc1e75ec749e86d06102e2b3e7359d57163d4cc6e633f8
+libhdhomerun_20210224.tgz MD5 0918453d0517bcda26c088a7e0e8f3fb

cross/tvheadend/Makefile

@@ -1,7 +1,8 @@
 PKG_NAME = tvheadend
 PKG_VERS = 4.3
 PKG_EXT = tar.gz
-PKG_GIT_HASH = 9ed76c0a176b055a57b6e8bd2e0b6e29409269a9
+# git hash from June 12th 2021
+PKG_GIT_HASH = eb59284b8527e3c51eadfeca94ec1e9174cdbdb0
 PKG_DIST_NAME = $(PKG_GIT_HASH).$(PKG_EXT)
 PKG_DIST_SITE = https://github.com/tvheadend/tvheadend/archive
 PKG_DIST_FILE = $(PKG_NAME)-git$(PKG_GIT_HASH).$(PKG_EXT)
@@ -16,6 +17,7 @@ LICENSE  = GPL v3
 
 GNU_CONFIGURE = 1
 PRE_CONFIGURE_TARGET = tvheadend_pre_configure
+POST_INSTALL_TARGET = tvheadend_post_install
 
 CONFIGURE_ARGS = --enable-imagecache --enable-bundle --enable-trace --release
 CONFIGURE_ARGS += --disable-bintray_cache --disable-avahi
@@ -56,3 +58,9 @@ endif
 tvheadend_pre_configure:
 	# Fix so mkbundle finds the pngquant binary
 	@$(RUN) sed -i.bak "s|^pngquant_bin = '/usr|pngquant_bin = '$(STAGING_INSTALL_PREFIX)|g" support/mkbundle
+
+.PHONY: tvheadend_post_install
+tvheadend_post_install:
+	# Enforce python3
+	@$(RUN) sed -i 's|env python$$|env python3|g' $(INSTALL_DIR)/$(INSTALL_PREFIX)/bin/tv_meta_tmdb.py
+	@$(RUN) sed -i 's|env python$$|env python3|g' $(INSTALL_DIR)/$(INSTALL_PREFIX)/bin/tv_meta_tvdb.py

cross/tvheadend/digests

@@ -1,3 +1,3 @@
-tvheadend-git9ed76c0a176b055a57b6e8bd2e0b6e29409269a9.tar.gz SHA1 6d8f86a1f4a9318537b06d55a9aea76245c961c0
-tvheadend-git9ed76c0a176b055a57b6e8bd2e0b6e29409269a9.tar.gz SHA256 d9ea0d1d1596efc5d6fed1595391a7cb2fc2442aa292fe0b57b9ab6910b32046
-tvheadend-git9ed76c0a176b055a57b6e8bd2e0b6e29409269a9.tar.gz MD5 ff0b7102c72be18146f3f44051d2270e
+tvheadend-giteb59284b8527e3c51eadfeca94ec1e9174cdbdb0.tar.gz SHA1 0b27567b389131c0e0ee2c82507c9417da5d9908
+tvheadend-giteb59284b8527e3c51eadfeca94ec1e9174cdbdb0.tar.gz SHA256 df3d50cd46e7d6b9d951bc36950eb1a49ac82fd5c2b08c3abc37cf8fba15651c
+tvheadend-giteb59284b8527e3c51eadfeca94ec1e9174cdbdb0.tar.gz MD5 de451b133121556868ba28b899902308

spk/tvheadend/Makefile

@@ -1,10 +1,10 @@
 SPK_NAME = tvheadend
 SPK_SHORT_VERS = 4.3
-SPK_GIT_HASH = 9ed76c0
-SPK_GIT_DATE = 20201011
+SPK_GIT_HASH = eb59284
+SPK_GIT_DATE = 20210612
 SPK_VERS = $(SPK_SHORT_VERS).$(SPK_GIT_DATE)
 TVH_VERS = $(SPK_SHORT_VERS)~$(SPK_GIT_HASH)
-SPK_REV = 27
+SPK_REV = 28
 SPK_ICON = src/tvheadend.png
 DSM_UI_DIR = app
 
@@ -13,7 +13,7 @@ DSM_UI_DIR = app
 # 000-fix-version.patch from cross/tvheadend
 export TVH_VERS
 
-DEPENDS = cross/$(SPK_NAME) cross/zap2epg
+DEPENDS = cross/$(SPK_NAME) cross/zap2epg cross/dtv-scan-tables
 WHEELS = src/requirements.txt
 SPK_DEPENDS = "python38"
 
@@ -22,7 +22,7 @@ DESCRIPTION = Tvheadend is a TV streaming server and recorder for Linux, FreeBSD
 RELOAD_UI = yes
 DISPLAY_NAME = Tvheadend
 STARTABLE = yes
-CHANGELOG = "1. Update to latest git version 9ed76c0 as of October 11th 2020<br/>2. Update openssl to 1.1"
+CHANGELOG = "1. Update to latest git version eb59284 as of June 12th 2021<br/>2. Update openssl to 1.1<br/>3. Updated to use FFMPEG 4.3.2<br/>4. Updated libhdhomerun to version 20210224"
 HOMEPAGE = https://tvheadend.org/
 LICENSE = GPL v3
 

spk/tvheadend/src/service-setup.sh

@@ -40,10 +40,6 @@ service_postinst ()
              ${WHEELHOUSE} ${WHEELHOUSE}/*.whl
 }
 
-service_preupgrade ()
-{
-}
-
 service_postupgrade ()
 {
     # Need to enforce correct permissions for recording directories on upgrades