github-action: Fix for new ffmpeg.mk

.github/actions/prepare.sh

@@ -56,7 +56,7 @@ packages=$(printf %s "${SPK_TO_BUILD}" | tr ' ' '\n' | sort -u | tr '\n' ' ')
 
 # for ffmpeg v5-6 find all packages that depend on them
 for i in {5..6}; do
-    ffmpeg_dependent_packages=$(find spk/ -maxdepth 2 -mindepth 2 -name "Makefile" -exec grep -Ho "FFMPEG_VERSION = ${i}" {} \; | grep -Po ".*spk/\K[^/]*" | sort | tr '\n' ' ')
+    ffmpeg_dependent_packages=$(find spk/ -maxdepth 2 -mindepth 2 -name "Makefile" -exec grep -Ho "FFMPEG_PACKAGE = ffmpeg${i}" {} \; | grep -Po ".*spk/\K[^/]*" | sort | tr '\n' ' ')
 
     # If packages contain a package that depends on ffmpeg (or is ffmpeg),
     # then ensure relevant ffmpeg5|ffmpeg6 is first in list

cross/chromaprint/Makefile

@@ -15,6 +15,8 @@ HOMEPAGE = https://acoustid.org/chromaprint
 COMMENT  = Chromaprint is the core component of the AcoustID project. It\'s a client-side library that implements a custom algorithm for extracting fingerprints from any audio source.
 LICENSE  = LGPL2.1+
 
+OPTIONAL_DEPENDS = cross/ffmpeg6
+
 # compiler too old
 UNSUPPORTED_ARCHS = $(ARMv5_ARCHS) $(OLD_PPC_ARCHS)
 
@@ -44,7 +46,7 @@ CMAKE_ARGS += -DFFMPEG_LIBSWSCALE_INCLUDE_DIRS:PATH=$(FFMPEG_STAGING_PREFIX)/inc
 CMAKE_ARGS += -DFFMPEG_LIBSWSCALE_LIBRARIES:FILEPATH=$(FFMPEG_STAGING_PREFIX)/lib/libswscale.so
 
 else
-DEPENDS = cross/$(FFMPEG_PACKAGE)
+DEPENDS = cross/ffmpeg6
 CMAKE_RPATH =
 endif
 

cross/comskip/Makefile

@@ -8,7 +8,7 @@ PKG_DIST_FILE = $(PKG_NAME)-git$(PKG_GIT_HASH).$(PKG_EXT)
 PKG_DIR = $(PKG_NAME)-$(PKG_GIT_HASH)
 
 DEPENDS = cross/argtable
-OPTIONAL_DEPENDS = cross/ffmpeg$(FFMPEG_VERSION)
+OPTIONAL_DEPENDS = cross/ffmpeg5
 
 HOMEPAGE = https://www.kaashoek.com/comskip
 COMMENT  = Commercial detector
@@ -17,6 +17,10 @@ LICENSE  = GNU/LGPL
 PRE_CONFIGURE_TARGET = comskip_pre_configure
 GNU_CONFIGURE = 1
 
+ifeq ($(wildcard $(FFMPEG_PACKAGE_ROOT)),)
+DEPENDS = cross/ffmpeg5
+endif
+
 include ../../mk/spksrc.cross-cc.mk
 
 .PHONY: comskip_pre_configure

cross/tvheadend/Makefile

@@ -9,6 +9,25 @@ PKG_DIST_SITE = https://github.com/tvheadend/tvheadend/archive
 PKG_DIST_FILE = $(PKG_NAME)-git$(PKG_GIT_HASH).$(PKG_EXT)
 PKG_DIR = $(PKG_NAME)-$(PKG_GIT_HASH)
 
+HOMEPAGE = https://tvheadend.org/
+COMMENT  = Tvheadend is a TV streaming server and recorder for Linux, FreeBSD and Android supporting DVB-S, DVB-S2, DVB-C, DVB-T, ATSC, ISDB-T, IPTV, SAT IP and HDHomeRun as input sources. Tvheadend offers HTTP, HTSP and SAT IP streaming.
+LICENSE  = GPLv3
+
+# PPC archs except qoriq are not supported
+# https://tvheadend.org/issues/5060
+UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS)
+
+OPTIONAL_DEPENDS += cross/ffmpeg6
+OPTIONAL_DEPENDS += cross/fdk-aac
+OPTIONAL_DEPENDS += cross/fontconfig
+OPTIONAL_DEPENDS += cross/opus
+OPTIONAL_DEPENDS += cross/pcre2
+OPTIONAL_DEPENDS += cross/libtheora
+OPTIONAL_DEPENDS += cross/libvorbis
+OPTIONAL_DEPENDS += cross/libvpx
+OPTIONAL_DEPENDS += cross/x264
+OPTIONAL_DEPENDS += cross/x265
+
 # WARNING: pngquant will fail when built after cross/zlib (i.e. cross/libpng)
 # with prebuilt ffmpeg this is not a problem
 # without prebuilt ffmpeg the "DEPENDS += cross/ffmpeg*" must be defined below
@@ -23,14 +42,6 @@ DEPENDS += cross/curl
 # curl build needs additional configuration for gnutls and libssh2
 export BUILD_CURL_WITH="gnutls libssh2 zstd"
 
-# PPC archs except qoriq are not supported
-# https://tvheadend.org/issues/5060
-UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS)
-
-HOMEPAGE = https://tvheadend.org/
-COMMENT  = Tvheadend is a TV streaming server and recorder for Linux, FreeBSD and Android supporting DVB-S, DVB-S2, DVB-C, DVB-T, ATSC, ISDB-T, IPTV, SAT IP and HDHomeRun as input sources. Tvheadend offers HTTP, HTSP and SAT IP streaming.
-LICENSE  = GPLv3
-
 GNU_CONFIGURE = 1
 PRE_CONFIGURE_TARGET = tvheadend_pre_configure
 POST_INSTALL_TARGET = tvheadend_post_install

spk/tvheadend/Makefile

@@ -13,7 +13,8 @@ DSM_UI_DIR = app
 # 000-fix-version.patch from cross/tvheadend
 export TVH_VERS
 
-SPK_DEPENDS = 'python311>=3.11.4-7:ffmpeg6'
+FFMPEG_PACKAGE = ffmpeg6
+SPK_DEPENDS = 'python311>=3.11.4-7:$(FFMPEG_PACKAGE)'
 
 WHEELS = src/requirements-pure.txt