diff --git a/cross/tvheadend/Makefile b/cross/tvheadend/Makefile index 0049e7962fc..9541e3fe4fd 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 April 8th 2023 -PKG_GIT_HASH = f32c7c59a19a276648d7b068041738e4e8337638 +# git hash from commit of August 6th 2023 +PKG_GIT_HASH = 17eebbef5b017352afcded36c27cb0be11ebd4a1 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 9699cace50d..a9142f696f4 100644 --- a/cross/tvheadend/digests +++ b/cross/tvheadend/digests @@ -1,3 +1,3 @@ -tvheadend-gitf32c7c59a19a276648d7b068041738e4e8337638.tar.gz SHA1 bd90121237e26b18161cb38587db45eecde55dcb -tvheadend-gitf32c7c59a19a276648d7b068041738e4e8337638.tar.gz SHA256 f24596db1956f37c28df7ad096d28a5c9d045143ccfe85648e4182e7441d057d -tvheadend-gitf32c7c59a19a276648d7b068041738e4e8337638.tar.gz MD5 f222cb9294ad39c6924d1f9d37b46dcf +tvheadend-git17eebbef5b017352afcded36c27cb0be11ebd4a1.tar.gz SHA1 930fb9553dd1616e3d9c057a2f061cb07bc8462e +tvheadend-git17eebbef5b017352afcded36c27cb0be11ebd4a1.tar.gz SHA256 20f30c486f79f34d9fd6256e12aa82d02fce4b1bf7cfebf0e912a4fe83f17674 +tvheadend-git17eebbef5b017352afcded36c27cb0be11ebd4a1.tar.gz MD5 75d238c9e3159e94c232bdafcfe16969 diff --git a/cross/tvheadend/patches/001-fix-recording-dir.patch b/cross/tvheadend/patches/001-fix-recording-dir.patch index 242283cadb0..84c134cbfd7 100644 --- a/cross/tvheadend/patches/001-fix-recording-dir.patch +++ b/cross/tvheadend/patches/001-fix-recording-dir.patch @@ -1,12 +1,12 @@ # This ensures that the default recording directory is not placed in package system directories, independent of the DSM version ---- src/dvr/dvr_config.c.orig 2018-02-27 18:58:45.957196424 +0100 -+++ src/dvr/dvr_config.c 2018-02-27 19:00:17.210138337 +0100 -@@ -282,7 +282,7 @@ +--- src/dvr/dvr_config.c.orig 2023-08-05 09:33:28.751426318 +0000 ++++ src/dvr/dvr_config.c 2023-08-05 09:35:42.224770409 +0000 +@@ -289,7 +289,7 @@ dvr_config_storage_check(dvr_config_t *c + return; /* Try to figure out a good place to put them videos */ - -- homedir = getenv("HOME"); -+ homedir = "/usr/local/tvheadend/var"; - - if(homedir != NULL) { - snprintf(buf, sizeof(buf), "%s/Videos", homedir); +- snprintf(home_dir, sizeof(home_dir), "%s/Videos", getenv("HOME")); ++ snprintf(home_dir, sizeof(home_dir), "%s/Videos", getenv("/var/packages/tvheadend/var")); + xdg_dir = hts_settings_get_xdg_dir_with_fallback("VIDEOS", home_dir); + if (xdg_dir != NULL) { + if (stat(xdg_dir, &st) == 0) { diff --git a/spk/tvheadend/Makefile b/spk/tvheadend/Makefile index e3b96b2d9ed..b3538245e13 100644 --- a/spk/tvheadend/Makefile +++ b/spk/tvheadend/Makefile @@ -1,7 +1,7 @@ SPK_NAME = tvheadend SPK_SHORT_VERS = 4.3 -SPK_GIT_HASH = f32c7c5 -SPK_GIT_DATE = 20230408 +SPK_GIT_HASH = 17eebbe +SPK_GIT_DATE = 20230806 SPK_VERS = $(SPK_SHORT_VERS).$(SPK_GIT_DATE) TVH_VERS = $(SPK_SHORT_VERS)~$(SPK_GIT_HASH) SPK_REV = 36 @@ -26,7 +26,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 f32c7c5 as of April 8th 2023
2. Update FFMPEG 5.1.2
3. Update libhdhomerun to version 20230323" +CHANGELOG = "1. Update to latest git version 17eebbe as of August 6th 2023" HOMEPAGE = https://tvheadend.org/ LICENSE = GPL v3