Update Tvheadend to 4.2.5 (maintenance release) and generic service s…

…upport for DSM 5+6
SynoCommunity · Dec 30, 2017 · 06b6ebb · 06b6ebb
1 parent 7eb9982
commit 06b6ebb
Show file tree

Hide file tree

Showing 13 changed files with 110 additions and 293 deletions.
diff --git a/cross/tvheadend/Makefile b/cross/tvheadend/Makefile
@@ -1,5 +1,5 @@
 PKG_NAME = tvheadend
-PKG_VERS = 4.2.4
+PKG_VERS = 4.2.5
 PKG_EXT = tar.gz
 PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://github.com/tvheadend/tvheadend/archive

diff --git a/cross/tvheadend/digests b/cross/tvheadend/digests
@@ -1,3 +1,3 @@
-tvheadend-4.2.4.tar.gz SHA1 1dc4442ef07a43232075ad886aca7f692c16e106
-tvheadend-4.2.4.tar.gz SHA256 231e487457a80adaaf097c4f2b84b981b86da40199ab186cf460061a97cd2269
-tvheadend-4.2.4.tar.gz MD5 7a0c6cc8ce84d9f8ddf47123b30ec167
+tvheadend-4.2.5.tar.gz SHA1 3799dcae34803a2f25e4ce730158028271d611f4
+tvheadend-4.2.5.tar.gz SHA256 36816c8b506af6b0f5df442bd96aa301223dc7c44d8b88eec53262e92956d740
+tvheadend-4.2.5.tar.gz MD5 d5f6065c1dcb1d3bc1a4cb757d2741c0
diff --git a/cross/tvheadend/patches/001-fix-version-number.patch b/cross/tvheadend/patches/001-fix-version-number.patch
@@ -6,7 +6,7 @@
    case $VER in
    [1-9]*\.[0-9]*) ;;
 -  *) VER="0.0.0~unknown" ;;
-+  *) VER="4.2.3" ;;
++  *) VER="4.2.5" ;;
    esac
  fi
 
diff --git a/spk/tvheadend/Makefile b/spk/tvheadend/Makefile
@@ -1,6 +1,6 @@
 SPK_NAME = tvheadend
-SPK_VERS = 4.2.4
-SPK_REV = 11
+SPK_VERS = 4.2.5
+SPK_REV = 12
 SPK_ICON = src/tvheadend.png
 DSM_UI_DIR = app
 BETA = 1
@@ -9,29 +9,38 @@ DEPENDS = cross/busybox cross/$(SPK_NAME)
 
 MAINTAINER = m4tt075
 DESCRIPTION = Tvheadend is a TV streaming server and recorder for Linux, FreeBSD and Android supporting DVB-S, DVB-S2, DVB-C, DVB-T, ATSC, ISDB-T, IPTV, SAT IP and HDHomeRun as input sources. Tvheadend offers HTTP, HTSP and SAT IP streaming.
-ADMIN_PORT = 9981
 RELOAD_UI = yes
 DISPLAY_NAME = Tvheadend
-CHANGELOG = "Update to Tvheadend 4.2.4 (Release), including update of libhdhomerun to 20170930"
-
+STARTABLE = yes
+CHANGELOG = "1. Update TVH to 4.2.5 (maintenance release), 2. Use DSM 5+6 generic service"
 HOMEPAGE = https://www.lonelycoder.com/tvheadend/
-LICENSE  = GPL v3
+LICENSE = GPL v3
 
-INSTALLER_SCRIPT = src/installer.sh
-SSS_SCRIPT       = src/dsm-control.sh
-FWPORTS          = src/${SPK_NAME}.sc
-CONF_DIR         = src/conf/
-WIZARDS_DIR      = src/wizard/
+WIZARDS_DIR = src/wizard/
+CONF_DIR = src/conf/
 
-INSTALL_PREFIX = /usr/local/$(SPK_NAME)
+# 'auto' reserved value grabs SPK_NAME
+SERVICE_USER = auto
+SERVICE_SETUP = src/service-setup.sh
 
+# Admin link
+ADMIN_PORT = 9981
+
+PRE_COPY_TARGET = tvheadend_install
 POST_STRIP_TARGET = tvheadend_extra_install
 
 BUSYBOX_CONFIG = usrmng
 ENV += BUSYBOX_CONFIG="$(BUSYBOX_CONFIG)"
 
 include ../../mk/spksrc.spk.mk
 
+.PHONY: tvheadend_install
+# Replace standard copy/install targets
+tvheadend_install:
+	rm -fr $(STAGING_DIR)
+	mkdir $(STAGING_DIR)
+	mkdir --parents $(STAGING_INSTALL_PREFIX)
+
 .PHONY: tvheadend_extra_install
 tvheadend_extra_install:
 	install -m 755 -d $(STAGING_DIR)/app

diff --git a/spk/tvheadend/src/conf/privilege b/spk/tvheadend/src/conf/privilege
diff --git a/spk/tvheadend/src/tvheadend.sc → spk/tvheadend/src/conf/tvheadend.sc b/spk/tvheadend/src/tvheadend.sc → spk/tvheadend/src/conf/tvheadend.sc
@@ -1,6 +1,5 @@
 [tvheadend]
 title="Tvheadend"
-desc="Tvheadend"
+desc="Tvheadend (http, htsp)"
 port_forward="yes"
-dst.ports="9981,9982/tcp"
-
+dst.ports="9981,9982/tcp"
diff --git a/spk/tvheadend/src/dsm-control.sh b/spk/tvheadend/src/dsm-control.sh
diff --git a/spk/tvheadend/src/installer.sh b/spk/tvheadend/src/installer.sh