From 0e14896d35f2abb99ddeb2424b713cc76ef9fcc5 Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Tue, 7 Dec 2021 12:17:49 +0000 Subject: [PATCH 1/4] pngquant: Update to version 2.17.0 --- cross/libimagequant/Makefile | 2 +- cross/libimagequant/digests | 6 +++--- cross/pngquant/Makefile | 2 +- cross/pngquant/digests | 6 +++--- .../src/{requirements.txt => requirements-pure.txt} | 0 5 files changed, 8 insertions(+), 8 deletions(-) rename spk/tvheadend/src/{requirements.txt => requirements-pure.txt} (100%) diff --git a/cross/libimagequant/Makefile b/cross/libimagequant/Makefile index 2a9d6a861ab..b03b4d6aa27 100644 --- a/cross/libimagequant/Makefile +++ b/cross/libimagequant/Makefile @@ -1,5 +1,5 @@ PKG_NAME = libimagequant -PKG_VERS = 2.12.6 +PKG_VERS = 2.17.0 PKG_EXT = tar.gz PKG_DIST_NAME = $(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://github.com/ImageOptim/$(PKG_NAME)/archive diff --git a/cross/libimagequant/digests b/cross/libimagequant/digests index 034089b8056..34a36849376 100644 --- a/cross/libimagequant/digests +++ b/cross/libimagequant/digests @@ -1,3 +1,3 @@ -libimagequant-2.12.6.tar.gz SHA1 950dd2cc5b7f611f365caa072601da1f0379d6c6 -libimagequant-2.12.6.tar.gz SHA256 b34964512c0dbe550c5f1b394c246c42a988cd73b71a76c5838aa2b4a96e43a0 -libimagequant-2.12.6.tar.gz MD5 ea4574e797ac8a28e21c0c61a100bb4f +libimagequant-2.17.0.tar.gz SHA1 8ccb742e817e9d50317685af529410d7d7e3b0c8 +libimagequant-2.17.0.tar.gz SHA256 9f6cc50182be4d2ece75118aa0b0fd3e9bbad06e94fd6b9eb3a4c08129c2dd26 +libimagequant-2.17.0.tar.gz MD5 0447f0de4c68aef5f342ddec58a46e7c diff --git a/cross/pngquant/Makefile b/cross/pngquant/Makefile index 2409ff802a9..567b79e66fa 100644 --- a/cross/pngquant/Makefile +++ b/cross/pngquant/Makefile @@ -1,5 +1,5 @@ PKG_NAME = pngquant -PKG_VERS = 2.12.5 +PKG_VERS = 2.17.0 PKG_EXT = tar.gz PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS)-src.$(PKG_EXT) PKG_DIST_SITE = https://pngquant.org diff --git a/cross/pngquant/digests b/cross/pngquant/digests index b09b54a1f77..7c16469d22c 100644 --- a/cross/pngquant/digests +++ b/cross/pngquant/digests @@ -1,3 +1,3 @@ -pngquant-2.12.5-src.tar.gz SHA1 7e1398e54bb0ecb831a3a2eaaede99ebbcddbb61 -pngquant-2.12.5-src.tar.gz SHA256 3638936cf6270eeeaabcee42e10768d78e4dc07cac9310307835c1f58b140808 -pngquant-2.12.5-src.tar.gz MD5 e2a02de064d6887d563fa12ceb1eb775 +pngquant-2.17.0-src.tar.gz SHA1 886af39c9b7c2f55f4835cced7fb56f1371c9967 +pngquant-2.17.0-src.tar.gz SHA256 a27cf0e64db499ccb3ddae9b36036e881f78293e46ec27a9e7a86a3802fcda66 +pngquant-2.17.0-src.tar.gz MD5 e18dd9cc2114c28f85b04b376512c267 diff --git a/spk/tvheadend/src/requirements.txt b/spk/tvheadend/src/requirements-pure.txt similarity index 100% rename from spk/tvheadend/src/requirements.txt rename to spk/tvheadend/src/requirements-pure.txt From 94dcb7c80b45ecdf0d395a252f19acd12d171dae Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Tue, 7 Dec 2021 12:18:07 +0000 Subject: [PATCH 2/4] readline: Update to version 8.1 --- cross/readline/Makefile | 2 +- cross/readline/PLIST | 8 ++++---- cross/readline/digests | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cross/readline/Makefile b/cross/readline/Makefile index 38932b4a608..af91e6f4739 100644 --- a/cross/readline/Makefile +++ b/cross/readline/Makefile @@ -1,5 +1,5 @@ PKG_NAME = readline -PKG_VERS = 7.0 +PKG_VERS = 8.1 PKG_EXT = tar.gz PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://ftp.gnu.org/gnu/$(PKG_NAME) diff --git a/cross/readline/PLIST b/cross/readline/PLIST index d97ef9942ac..c93621f6bb4 100644 --- a/cross/readline/PLIST +++ b/cross/readline/PLIST @@ -1,6 +1,6 @@ lnk:lib/libhistory.so -lnk:lib/libhistory.so.7 -lib:lib/libhistory.so.7.0 +lnk:lib/libhistory.so.8 +lib:lib/libhistory.so.8.1 lnk:lib/libreadline.so -lnk:lib/libreadline.so.7 -lib:lib/libreadline.so.7.0 +lnk:lib/libreadline.so.8 +lib:lib/libreadline.so.8.1 diff --git a/cross/readline/digests b/cross/readline/digests index 0e5724a39b8..ac38ee224f0 100644 --- a/cross/readline/digests +++ b/cross/readline/digests @@ -1,3 +1,3 @@ -readline-7.0.tar.gz SHA1 d9095fa14a812495052357e1d678b3f2ac635463 -readline-7.0.tar.gz SHA256 750d437185286f40a369e1e4f4764eda932b9459b5ec9a731628393dd3d32334 -readline-7.0.tar.gz MD5 205b03a87fc83dab653b628c59b9fc91 +readline-8.1.tar.gz SHA1 48c5e0c3a212449e206e21ba82856accac842c6f +readline-8.1.tar.gz SHA256 f8ceb4ee131e3232226a17f51b164afc46cd0b9e6cef344be87c65962cb82b02 +readline-8.1.tar.gz MD5 e9557dd5b1409f5d7b37ef717c64518e From 9931d7a7ee06c6558bfc30329148331409ac57d6 Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Tue, 7 Dec 2021 12:18:40 +0000 Subject: [PATCH 3/4] tvheadend: Update to latest commit from Nov. 21th 2021 --- cross/tvheadend/Makefile | 4 ++-- cross/tvheadend/digests | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cross/tvheadend/Makefile b/cross/tvheadend/Makefile index 9c6551c8cb0..7d2cc1662d5 100644 --- a/cross/tvheadend/Makefile +++ b/cross/tvheadend/Makefile @@ -1,8 +1,8 @@ PKG_NAME = tvheadend PKG_VERS = 4.3 PKG_EXT = tar.gz -# git hash from October 20th 2021 -PKG_GIT_HASH = c6bb43d8554643a772aa40c5e56904717b55a95f +# git hash from November 21th 2021 +PKG_GIT_HASH = b8710206eb073c72b142bce95846b77a0ffa34a6 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 index 5a2255283d6..3d4dcb146f6 100644 --- a/cross/tvheadend/digests +++ b/cross/tvheadend/digests @@ -1,3 +1,3 @@ -tvheadend-gitc6bb43d8554643a772aa40c5e56904717b55a95f.tar.gz SHA1 2ab69e7cb5624659e3d2a42c6d9fcf5e9e69e253 -tvheadend-gitc6bb43d8554643a772aa40c5e56904717b55a95f.tar.gz SHA256 9074d6a352f4475e5e0ad313d6e78187730f2139a778cb4c67586e74f0b9ba40 -tvheadend-gitc6bb43d8554643a772aa40c5e56904717b55a95f.tar.gz MD5 9630d640835e8792d45a8aca6ba80aae +tvheadend-gitb8710206eb073c72b142bce95846b77a0ffa34a6.tar.gz SHA1 f58618e9ea72a5070774f12cf3279cee9843e83b +tvheadend-gitb8710206eb073c72b142bce95846b77a0ffa34a6.tar.gz SHA256 11eeca461e74fbe8306916933cab96d35a99fa89d81e26126e194875c41b6fad +tvheadend-gitb8710206eb073c72b142bce95846b77a0ffa34a6.tar.gz MD5 dd24e856544656b84482b2886254f1f1 From f6bfbc0bdf81edc4394b0a21e2c2da28c9db46c4 Mon Sep 17 00:00:00 2001 From: Vincent Fortier Date: Tue, 7 Dec 2021 12:19:02 +0000 Subject: [PATCH 4/4] tvheadend: Migrate to python310 --- spk/tvheadend/Makefile | 12 +++++------ spk/tvheadend/src/requirements-pure.txt | 2 +- spk/tvheadend/src/service-setup.sh | 27 +++++++++---------------- 3 files changed, 17 insertions(+), 24 deletions(-) diff --git a/spk/tvheadend/Makefile b/spk/tvheadend/Makefile index 56633b3f18f..605ba1f4aac 100644 --- a/spk/tvheadend/Makefile +++ b/spk/tvheadend/Makefile @@ -1,10 +1,10 @@ SPK_NAME = tvheadend SPK_SHORT_VERS = 4.3 -SPK_GIT_HASH = c6bb43d -SPK_GIT_DATE = 20211020 +SPK_GIT_HASH = b871020 +SPK_GIT_DATE = 20211121 SPK_VERS = $(SPK_SHORT_VERS).$(SPK_GIT_DATE) TVH_VERS = $(SPK_SHORT_VERS)~$(SPK_GIT_HASH) -SPK_REV = 30 +SPK_REV = 31 SPK_ICON = src/tvheadend.png DSM_UI_DIR = app @@ -13,8 +13,8 @@ DSM_UI_DIR = app # 000-fix-version.patch from cross/tvheadend export TVH_VERS -SPK_DEPENDS = "python38" -WHEELS = src/requirements.txt +SPK_DEPENDS = "python310" +WHEELS = src/requirements-pure.txt DEPENDS = cross/$(SPK_NAME) cross/zap2epg cross/dtv-scan-tables @@ -24,7 +24,7 @@ DESCRIPTION_FRE = Tvheadend est un serveur de streaming et enregistreur TV pour RELOAD_UI = yes DISPLAY_NAME = Tvheadend STARTABLE = yes -CHANGELOG = "1. Update to latest git version c6bb43d as of June 20th 2021
2. Update openssl to 1.1
3. Updated to use FFMPEG 4.3.3
4. Updated libhdhomerun to version 20210624" +CHANGELOG = "1. Update to latest git version b871020 as of November 21th 2021
2. Update openssl to 1.1l
3. Updated to use FFMPEG 4.3.3
4. Updated libhdhomerun to version 20210624
5. Update to Python 3.10
6. Update pngquant to version 2.17.0
7. Update readline to version 8.1" HOMEPAGE = https://tvheadend.org/ LICENSE = GPL v3 diff --git a/spk/tvheadend/src/requirements-pure.txt b/spk/tvheadend/src/requirements-pure.txt index 84b557c9ea3..f5203c74f01 100644 --- a/spk/tvheadend/src/requirements-pure.txt +++ b/spk/tvheadend/src/requirements-pure.txt @@ -1,4 +1,4 @@ -certifi==2021.5.30 +#certifi==2021.5.30 ==> python310 chardet==4.0.0 requests==2.25.1 urllib3==1.26.5 diff --git a/spk/tvheadend/src/service-setup.sh b/spk/tvheadend/src/service-setup.sh index 78989220419..42a3da5f016 100644 --- a/spk/tvheadend/src/service-setup.sh +++ b/spk/tvheadend/src/service-setup.sh @@ -1,13 +1,9 @@ -# Package specific behaviors -# Sourced script by generic installer and start-stop-status scripts - -# Add ffmpeg and ifself to path -PYTHON_DIR="/var/packages/python38/target" -PYTHONENV="${SYNOPKG_PKGDEST}/env" -VIRTUALENV="${PYTHON_DIR}/bin/virtualenv" -WHEELHOUSE=${SYNOPKG_PKGDEST}/share/wheelhouse -FFMPEG_DIR="/var/packages/ffmpeg/target" -PATH="${SYNOPKG_PKGDEST}/env/bin:${SYNOPKG_PKGDEST}/bin:${FFMPEG_DIR}/bin:${PYTHON_DIR}/bin:${PATH}" +# Define python310 binary path +PYTHON_DIR="/var/packages/python310/target/bin" +# Define ffmpeg binary path +FFMPEG_DIR="/var/packages/ffmpeg/target/bin" +# Add local bin, virtualenv along with ffmpeg and python310 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 HTTP=9981 @@ -16,7 +12,7 @@ HTSP=9982 # Replace generic service startup, run service in background GRPN=$(id -gn ${EFF_USER}) UPGRADE_CFG_DIR="${SYNOPKG_PKGVAR}/dvr/config" -SERVICE_COMMAND="${SYNOPKG_PKGDEST}/bin/tvheadend -f -C -u ${EFF_USER} -g ${GRPN} --http_port ${HTTP} --htsp_port ${HTSP} -c ${SYNOPKG_PKGVAR} -p ${PID_FILE} -l ${LOG_FILE} --debug \"\"" +SERVICE_COMMAND="tvheadend -f -C -u ${EFF_USER} -g ${GRPN} --http_port ${HTTP} --htsp_port ${HTSP} -c ${SYNOPKG_PKGVAR} -p ${PID_FILE} -l ${LOG_FILE} --debug \"\"" SVC_BACKGROUND=yes # Group configuration to manage permissions of recording folders @@ -25,13 +21,10 @@ GROUP=sc-media service_postinst () { # EPG Grabber (zap2epg) - Create a Python virtualenv - ${VIRTUALENV} --system-site-packages ${PYTHONENV} + install_python_virtualenv - # EPG Grabber (zap2epg) - Install the wheels/requirements - ${SYNOPKG_PKGDEST}/env/bin/pip install \ - --no-deps --no-index --no-input --upgrade \ - --force-reinstall --find-links \ - ${WHEELHOUSE} ${WHEELHOUSE}/*.whl + # EPG Grabber (zap2epg) - Install the Python wheels + install_python_wheels } service_postupgrade ()