tvheadend: Fix SPK_DEPEND content parsing with '>' (#6156)

* tvheadend: Fix SPK_DEPEND content parsing with '>'

* tvheadend: Update to git hash 128d686 from June 23rd 2024

* tvheadend: Test changing second SPK_DEPENDS call with ffmpeg6

* tvheadend: Fix '>' issue

* libwebp: Add missing entries to PLIST (including libsharpyuv.so)

cross/libwebp/PLIST

@@ -1,5 +1,12 @@
 bin:bin/cwebp
 bin:bin/dwebp
+bin:bin/gif2webp
+bin:bin/img2webp
+bin:bin/webpinfo
+bin:bin/webpmux
+lnk:lib/libsharpyuv.so
+lnk:lib/libsharpyuv.so.0
+lib:lib/libsharpyuv.so.0.1.0
 lnk:lib/libwebp.so
 lnk:lib/libwebp.so.7
 lib:lib/libwebp.so.7.1.9

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 June 15th 2024
-PKG_GIT_HASH = 366e5629057e39de68932a0a0613a8af14076e31
+# git hash from June 23rd 2024
+PKG_GIT_HASH = 128d6861fac67ea6638c2956d092a46e23eb8988
 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)

cross/tvheadend/digests

@@ -1,3 +1,3 @@
-tvheadend-git366e5629057e39de68932a0a0613a8af14076e31.tar.gz SHA1 70b1e01efa0667f49382bf7fd4268b4fd4f7e8ae
-tvheadend-git366e5629057e39de68932a0a0613a8af14076e31.tar.gz SHA256 de8b811f74dc0affd3368fcf0656cc497ab66fabdb710d06a1df12544037e086
-tvheadend-git366e5629057e39de68932a0a0613a8af14076e31.tar.gz MD5 c818241febf2b752972a935f674c07f7
+tvheadend-git128d6861fac67ea6638c2956d092a46e23eb8988.tar.gz SHA1 42755a15dd68f78450e128bbb3d1899aa802b175
+tvheadend-git128d6861fac67ea6638c2956d092a46e23eb8988.tar.gz SHA256 53515bc5bb5553ef9c6ba0545d75b01d8943658168597965b59c365b6e1f2031
+tvheadend-git128d6861fac67ea6638c2956d092a46e23eb8988.tar.gz MD5 b02f718f776b0a593170227633a66c11

spk/tvheadend/Makefile

@@ -1,7 +1,7 @@
 SPK_NAME = tvheadend
 SPK_SHORT_VERS = 4.3
-SPK_GIT_HASH = 366e562
-SPK_GIT_DATE = 20240615
+SPK_GIT_HASH = 128d686
+SPK_GIT_DATE = 20240623
 SPK_VERS = $(SPK_SHORT_VERS).$(SPK_GIT_DATE)
 TVH_VERS = $(SPK_SHORT_VERS)~$(SPK_GIT_HASH)
 SPK_REV = 37
@@ -13,7 +13,7 @@ DSM_UI_DIR = app
 # 000-fix-version.patch from cross/tvheadend
 export TVH_VERS
 
-SPK_DEPENDS = "python311>=3.11.4-7"
+SPK_DEPENDS = 'python311>=3.11.4-7'
 
 WHEELS = src/requirements-pure.txt
 
@@ -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<br/>2. Update FFMPEG 5.1.2<br/>3. Update libhdhomerun to version 20231214<br/>4. Migrate to using python 3.11 and openssl 3.<br/>5. Update pngquant to v3.0.3."
+CHANGELOG = "1. Update to latest git version 128d686 as of June 23rd 2024<br/>2. Update to FFMPEG 6.0.1<br/>3. Update libhdhomerun to version 20231214<br/>4. Migrate to using python 3.11 and openssl 3.<br/>5. Update pngquant to v3.0.3."
 HOMEPAGE = https://tvheadend.org/
 LICENSE = GPL v3
 
@@ -54,7 +54,7 @@ export FFMPEG_DIR = $(realpath $(shell pwd)/../ffmpeg$(FFMPEG_VERSION)/work-$(AR
 ifneq ($(wildcard $(FFMPEG_DIR)),)
 export ADDITIONAL_LDFLAGS = -Wl,--rpath-link,$(FFMPEG_DIR)/lib -Wl,--rpath,/var/packages/ffmpeg$(subst 4,,$(FFMPEG_VERSION))/target/lib
 PRE_DEPEND_TARGET = tvheadend_pre_depend
-SPK_DEPENDS := "$(SPK_DEPENDS):ffmpeg$(subst 4,,$(FFMPEG_VERSION))>$(shell sed -n 's/^SPK_VERS = \(.*\)/\1/p' $(shell pwd)/../ffmpeg$(FFMPEG_VERSION)/Makefile | cut -c -3)"
+SPK_DEPENDS := $(SPK_DEPENDS)':ffmpeg$(subst 4,,$(FFMPEG_VERSION))>$(shell sed -n 's/^SPK_VERS = \(.*\)/\1/p' $(shell pwd)/../ffmpeg$(FFMPEG_VERSION)/Makefile | cut -c -3)'
 endif
 
 include ../../mk/spksrc.spk.mk