tvheadend: Update 653bd04 Nov 11th 2024 and migrate to python 3.12

SynoCommunity · Jan 26, 2025 · d97bb52 · d97bb52
1 parent d824dbe
commit d97bb52
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 17 deletions.
diff --git a/cross/tvheadend/Makefile b/cross/tvheadend/Makefile
@@ -2,8 +2,8 @@ PKG_NAME = tvheadend
 PKG_VERS = 4.3
 PKG_EXT = tar.gz
 # no official release since v4.2.8 (Jan 12, 2019)
-# git hash from Sept 28th 2024
-PKG_GIT_HASH = 28de5c092c657ffbbffa422c2ca3c07ba513c567
+# git hash from Nov 11th 2024
+PKG_GIT_HASH = 653bd0400b4413db96b80c807f0f7524f9248adb
 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)

diff --git a/cross/tvheadend/digests b/cross/tvheadend/digests
@@ -1,3 +1,3 @@
-tvheadend-git28de5c092c657ffbbffa422c2ca3c07ba513c567.tar.gz SHA1 613005d7a090f47195681c1e7832d88ab24157c4
-tvheadend-git28de5c092c657ffbbffa422c2ca3c07ba513c567.tar.gz SHA256 169fad177ad3b81580c6865330e3ccb1b9fa37442d6a79e2fd4ba3415af6fde2
-tvheadend-git28de5c092c657ffbbffa422c2ca3c07ba513c567.tar.gz MD5 ebf507be95fb771e07c5a2ba40120b08
+tvheadend-git653bd0400b4413db96b80c807f0f7524f9248adb.tar.gz SHA1 f04c23fbaeb4b31346c81a22276e7b0c89a87abe
+tvheadend-git653bd0400b4413db96b80c807f0f7524f9248adb.tar.gz SHA256 9c2e13a70f97cf4c9b37cd93bfd03a7a1e0b7f3b18080c40ef99b8917642dbd7
+tvheadend-git653bd0400b4413db96b80c807f0f7524f9248adb.tar.gz MD5 b0aee8e704d832e1a8f02171ee809834
diff --git a/spk/tvheadend/Makefile b/spk/tvheadend/Makefile
@@ -1,10 +1,10 @@
 SPK_NAME = tvheadend
 SPK_SHORT_VERS = 4.3
-SPK_GIT_HASH = 28de5c0
-SPK_GIT_DATE = 20240928
+SPK_GIT_HASH = 653bd04
+SPK_GIT_DATE = 20241111
 SPK_VERS = $(SPK_SHORT_VERS).$(SPK_GIT_DATE)
 TVH_VERS = $(SPK_SHORT_VERS)~$(SPK_GIT_HASH)
-SPK_REV = 40
+SPK_REV = 41
 SPK_ICON = src/tvheadend.png
 DSM_UI_DIR = app
 
@@ -14,7 +14,7 @@ DSM_UI_DIR = app
 export TVH_VERS
 
 FFMPEG_PACKAGE = ffmpeg7
-SPK_DEPENDS = 'python311>=3.11.4-7:$(FFMPEG_PACKAGE)'
+SPK_DEPENDS = 'python312:$(FFMPEG_PACKAGE)'
 
 # PPC archs except qoriq are not supported
 # https://tvheadend.org/issues/5060
@@ -34,7 +34,7 @@ DESCRIPTION = Tvheadend is a TV streaming server and recorder for Linux, FreeBSD
 DESCRIPTION_FRE = Tvheadend est un serveur de streaming et enregistreur TV pour Linux, FreeBSD et Android prenant en charge DVB-S, DVB-S2, DVB-C, DVB-T, ATSC, ISDB-T, IPTV, SAT IP et HDHomeRun comme sources d\'entrée. Tvheadend offre le streaming HTTP, HTSP et SAT IP.
 DISPLAY_NAME = Tvheadend
 STARTABLE = yes
-CHANGELOG = "1. Update to latest git version 55404da as of Sept. 20th 2024. <br/>2. Update to FFMPEG 7.0.2. <br/>3. Fix to use ffmpeg of ffmpeg7 package."
+CHANGELOG = "1. Update to latest git version 653bd04 as of Nov. 11th 2024. <br/>2. Migrate to python 3.12."
 HOMEPAGE = https://tvheadend.org/
 LICENSE = GPL v3
 

diff --git a/spk/tvheadend/src/requirements-pure.txt b/spk/tvheadend/src/requirements-pure.txt
@@ -1,4 +1,4 @@
-#certifi==2021.5.30 ==> python310
-chardet==4.0.0
-requests==2.25.1
-urllib3==1.26.5
+#certifi==2021.5.30 ==> python312
+chardet==5.2.0
+requests==2.32.3
+urllib3==2.3.0
diff --git a/spk/tvheadend/src/service-setup.sh b/spk/tvheadend/src/service-setup.sh
@@ -1,8 +1,8 @@
-# Define python311 binary path
-PYTHON_DIR="/var/packages/python311/target/bin"
+# Define python312 binary path
+PYTHON_DIR="/var/packages/python312/target/bin"
 # Define ffmpeg binary path
 FFMPEG_DIR="/var/packages/ffmpeg7/target/bin"
-# Add local bin, virtualenv along with ffmpeg and python311 to the default PATH
+# Add local bin, virtualenv along with ffmpeg and python312 to the default PATH
 PATH="${SYNOPKG_PKGDEST}/env/bin:${SYNOPKG_PKGDEST}/bin:${PYTHON_DIR}:${FFMPEG_DIR}:${PATH}"
 
 # Service configuration. Change http and htsp ports here and in conf/tvheadend.sc for non-standard ports