Skip to content

Commit a34c65e

Browse files
th0ma7th0ma7
authored
TVH updates (#6654)
* zap2epg: Update from version 4.0 to 4.1 * libhdhomerun: Update from version 20231214 to 20250506 * python+ffmpeg.mk: Allow combination of both under a single build * tvheadend: Update to git hash d6902132 from August 21st 2025 * tvheadend: Update gracenote2epg v1.5.1 using standard pypi install
1 parent 26b78b6 commit a34c65e

File tree

12 files changed

+47
-39
lines changed

12 files changed

+47
-39
lines changed

‎cross/libhdhomerun/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PKG_NAME = libhdhomerun
2-
PKG_VERS = 20231214
2+
PKG_VERS = 20250506
33
PKG_EXT = tgz
44
PKG_DIST_NAME = $(PKG_NAME)_$(PKG_VERS).$(PKG_EXT)
55
PKG_DIST_SITE = https://download.silicondust.com/hdhomerun

‎cross/libhdhomerun/digests‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
libhdhomerun_20231214.tgz SHA1 de614eb70864ccfbccd7e49b40cd24882614a29f
2-
libhdhomerun_20231214.tgz SHA256 552a102e8aa2abcc416090dec2f6f80da59f97f91f57968e9e9d7b3dc005dbaf
3-
libhdhomerun_20231214.tgz MD5 2e6e56eb97f97ca9d30041b9427c513c
1+
libhdhomerun_20250506.tgz SHA1 5de17a094030e6fcdab80bbcb2777596895fb79e
2+
libhdhomerun_20250506.tgz SHA256 879b1bc476c9b93e77ee280a84fc1157e7cc47d43ed9c8398d88a8ac5f35c034
3+
libhdhomerun_20250506.tgz MD5 0ad4ab9827cff41ef6c59f637265f200

‎cross/tvheadend/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ PKG_NAME = tvheadend
22
PKG_VERS = 4.3
33
PKG_EXT = tar.gz
44
# no official release since v4.2.8 (Jan 12, 2019)
5-
# git hash from June 4th 2025
6-
PKG_GIT_HASH = 808a87a6aa6eeabd4be3a024e4eea023aaf00cf6
5+
# git hash from August 21st 2025
6+
PKG_GIT_HASH = d69021326922bc2029f25858460ff4f5e245f89c
77
PKG_DIST_NAME = $(PKG_GIT_HASH).$(PKG_EXT)
88
PKG_DIST_SITE = https://github.com/tvheadend/tvheadend/archive
99
PKG_DIST_FILE = $(PKG_NAME)-git$(PKG_GIT_HASH).$(PKG_EXT)

‎cross/tvheadend/digests‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
tvheadend-git808a87a6aa6eeabd4be3a024e4eea023aaf00cf6.tar.gz SHA1 7b16e694687e801851809566a9db5f28a8c28160
2-
tvheadend-git808a87a6aa6eeabd4be3a024e4eea023aaf00cf6.tar.gz SHA256 184407354dda59478123aaca663451775b03ed3b430bc56d65bdda3972e5a48e
3-
tvheadend-git808a87a6aa6eeabd4be3a024e4eea023aaf00cf6.tar.gz MD5 0c598e6fc2f7e72b658b8193d9bd8c34
1+
tvheadend-gitd69021326922bc2029f25858460ff4f5e245f89c.tar.gz SHA1 bc2c2162d8513f8073e42b6c1e34216d99f5746f
2+
tvheadend-gitd69021326922bc2029f25858460ff4f5e245f89c.tar.gz SHA256 998625df8f0e2315e758018f7ce04e1f90b3945259e1c3a8a8c34ff8a97f2516
3+
tvheadend-gitd69021326922bc2029f25858460ff4f5e245f89c.tar.gz MD5 416175fac77b091971b2de5413edf42c

‎cross/zap2epg/Makefile‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
PKG_NAME = zap2epg
2-
PKG_VERS = 3.1
2+
PKG_VERS = 4.1
33
PKG_EXT = tar.gz
4-
PKG_GIT_HASH = 12a9f832c98fa75969afc848bc4e4a607d736ef0
5-
PKG_DIST_NAME = $(PKG_GIT_HASH).$(PKG_EXT)
6-
PKG_DIST_SITE = https://github.com/th0ma7/script.module.zap2epg/archive
4+
PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
75
PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
8-
PKG_DIR = script.module.zap2epg-$(PKG_GIT_HASH)
6+
PKG_DIST_SITE = https://github.com/th0ma7/tv_grab_zap2epg/archive/refs/tags
7+
PKG_DIR = tv_grab_zap2epg-$(PKG_VERS)
98

109
DEPENDS =
1110

12-
HOMEPAGE = https://github.com/edit4ever/script.module.zap2epg
13-
COMMENT = zap2epg will generate an xmltv.xml file for USA/Canada TV lineups using zap2it source
11+
HOMEPAGE = https://github.com/th0ma7/tv_grab_zap2epg
12+
COMMENT = tv_grab_zap2epg will generate an xmltv.xml file for Canada/USA TV lineups by fetching channel list from tvheadend and downloading relevant entries from tvlistings.gracenote.com.
1413
LICENSE = GPLv3
1514

1615
INSTALL_TARGET = zap2epg_install
@@ -20,6 +19,6 @@ include ../../mk/spksrc.install-resources.mk
2019
.PHONY: zap2epg_install
2120
zap2epg_install:
2221
install -m 755 -d $(STAGING_INSTALL_PREFIX)/bin
23-
install -m 755 $(WORK_DIR)/$(PKG_DIR)/tv_grab_zap2epg $(STAGING_INSTALL_PREFIX)/bin
24-
install -m 750 -d $(STAGING_INSTALL_PREFIX)/var/epggrab/conf
25-
install -m 640 $(WORK_DIR)/$(PKG_DIR)/epggrab/conf/zap2epg.xml $(STAGING_INSTALL_PREFIX)/var/epggrab/conf
22+
install -m 755 $(WORK_DIR)/$(PKG_DIR)/tv_grab_$(PKG_NAME) $(STAGING_INSTALL_PREFIX)/bin
23+
install -m 750 -d $(STAGING_INSTALL_PREFIX)/var/epggrab/$(PKG_NAME)/conf
24+
install -m 640 $(WORK_DIR)/$(PKG_DIR)/$(PKG_NAME).xml $(STAGING_INSTALL_PREFIX)/var/epggrab/$(PKG_NAME)/conf

‎cross/zap2epg/PLIST‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
rsc:bin/tv_grab_zap2epg
2-
rsc:var/epggrab/conf/zap2epg.xml
2+
rsc:var/epggrab/zap2epg/conf/zap2epg.xml

‎cross/zap2epg/digests‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
zap2epg-3.1.tar.gz SHA1 08c990545b017e0802f60c099e182c6f826c8bb2
2-
zap2epg-3.1.tar.gz SHA256 0987724c7a1e8a28d7434cb151c65125c5108cf81a6d0352d0d6fc107c426a49
3-
zap2epg-3.1.tar.gz MD5 a1f34e22cb7f5ce2ababf9227ef7123e
1+
zap2epg-4.1.tar.gz SHA1 5cf08b515a08a1e1311e2d583b39b399898d6b64
2+
zap2epg-4.1.tar.gz SHA256 f4ec9844a4de35899a271766742bd4d1949642dd28b922bc84d0d63b04d6f9ba
3+
zap2epg-4.1.tar.gz MD5 4f1bb193a4cecd42cfa7739590db5049

‎mk/spksrc.ffmpeg.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ FFMPEG_LIBS += libswscale.pc
4242
endif
4343

4444
# call-up pre-depend to prepare the shared ffmpeg build environment
45-
PRE_DEPEND_TARGET = ffmpeg_pre_depend
45+
PRE_DEPEND_TARGET += ffmpeg_pre_depend
4646

4747
else
4848
BUILD_DEPENDS += cross/$(FFMPEG_PACKAGE)

‎mk/spksrc.python.mk‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,19 @@ PYTHON_DEPENDS_EXCLUDE = bzip2 xz zlib
5656
PYTHON_DEPENDS := $(foreach cross,$(filter-out $(PYTHON_DEPENDS_EXCLUDE),$(foreach pkg_name,$(shell $(MAKE) dependency-list -C $(realpath $(PYTHON_PACKAGE_WORK_DIR)/../) 2>/dev/null | grep ^$(PYTHON_PACKAGE) | cut -f2 -d:),$(shell sed -n 's/^PKG_NAME = \(.*\)/\1/p' $(realpath $(CURDIR)/../../$(pkg_name)/Makefile)))),$(wildcard $(PYTHON_PACKAGE_WORK_DIR)/.$(cross)-*_done))
5757

5858
# call-up pre-depend to prepare the shared python build environment
59-
PRE_DEPEND_TARGET = python_pre_depend
59+
PRE_DEPEND_TARGET += python_pre_depend
6060

6161
else
6262
ifneq ($(findstring $(ARCH),$(ARMv5_ARCHS) $(OLD_PPC_ARCHS)),$(ARCH))
6363
BUILD_DEPENDS += cross/$(PYTHON_PACKAGE)
6464
endif
6565
endif
6666

67+
ifneq ($(FFMPEG_PACKAGE),)
68+
include ../../mk/spksrc.ffmpeg.mk
69+
else
6770
include ../../mk/spksrc.spk.mk
71+
endif
6872

6973
.PHONY: python_pre_depend
7074
python_pre_depend:

‎mk/spksrc.videodriver.mk‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ endif
5959

6060
# call-up pre-depend to prepare the shared videodrv build environment
6161
ifeq ($(strip $(PRE_DEPEND_TARGET)),)
62-
PRE_DEPEND_TARGET = videodrv_pre_depend
62+
PRE_DEPEND_TARGET += videodrv_pre_depend
6363
endif
6464

6565
# end ifeq $(x64_ARCHS)
@@ -74,5 +74,4 @@ videodrv_pre_depend:
7474
@$(MSG) "*** PATH: $(VIDEODRV_PACKAGE_ROOT)"
7575
@$(MSG) "*****************************************************"
7676
@mkdir -p $(STAGING_INSTALL_PREFIX)/lib/pkgconfig/
77-
$(MSG) VIDEODRV_LIBS: $(VIDEODRV_LIBS)
7877
@$(foreach lib,$(VIDEODRV_LIBS),ln -sf $(lib) $(STAGING_INSTALL_PREFIX)/lib/pkgconfig/ ;)

0 commit comments

Comments
 (0)