Misc updates ffmpeg related (#6208)

* chromaprint: Update to make usage of ffmpeg5

* comskip: Fix typo to use $(FFMPEG_VERSION)

* ffmpeg4: Mark as no longer supported

* svt-av1: Update from version 2.1.0 to 2.2.0

.github/actions/build.sh

@@ -12,8 +12,8 @@
 # - The build output is structured into log groups by package.
 # - As the disk space in the workflow environment is limitted, we clean the
 #   work folder of each package after build. At 2020.06 this limit is 14GB.
-# - ffmpeg (spk/ffmpeg4), ffmpeg5 and ffmpeg6 are not cleaned to be available for dependents.
-# - Therefore ffmpeg4, ffmpeg5 and ffmpeg6 are built first if triggered by its
+# - ffmpeg5 and ffmpeg6 are not cleaned to be available for dependents.
+# - Therefore ffmpeg5 and ffmpeg6 are built first if triggered by its
 #   own or a dependent (see prepare.sh).
 
 set -o pipefail
@@ -59,7 +59,7 @@ if [ -n "$API_KEY" ] && [ "$PUBLISH" == "true" ]; then
 fi
 
 # Build
-PACKAGES_TO_KEEP="ffmpeg4 ffmpeg5 ffmpeg6 python310 python311"
+PACKAGES_TO_KEEP="ffmpeg5 ffmpeg6 python310 python311"
 for package in ${build_packages}
 do
     echo "::group:: ---- build ${package}"

.github/actions/prepare.sh

@@ -6,7 +6,7 @@
 #
 # Functions:
 # - Evaluate all packages to build depending on files defined in ${GH_FILES}.
-# - python310, python311, ffmpeg (spk/ffmpeg4), ffmpeg5 and ffmpeg6 are moved to head of packages to build first if triggered by its own or a dependent.
+# - python310, python311, ffmpeg5 and ffmpeg6 are moved to head of packages to build first if triggered by its own or a dependent.
 # - Referenced native and cross packages of the packages to build are added to the download list.
 
 set -o pipefail
@@ -49,19 +49,16 @@ fi
 if [ "$(echo ${SPK_TO_BUILD} | grep -ow python)" != "" ]; then
     SPK_TO_BUILD=$(echo "${SPK_TO_BUILD}" | tr ' ' '\n' | grep -vw "python" | tr '\n' ' ')" python2"
 fi
-if [ "$(echo ${SPK_TO_BUILD} | grep -ow ffmpeg)" != "" ]; then
-    SPK_TO_BUILD=$(echo "${SPK_TO_BUILD}" | tr ' ' '\n' | grep -vw "ffmpeg" | tr '\n' ' ')" ffmpeg4"
-fi
 
 # remove duplicate packages
 packages=$(printf %s "${SPK_TO_BUILD}" | tr ' ' '\n' | sort -u | tr '\n' ' ')
 
 # for ffmpeg v4-6 find all packages that depend on them
-for i in {4..6}; do
+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' ' ')
 
     # If packages contain a package that depends on ffmpeg (or is ffmpeg), then ensure
-    # relevant ffmpeg4|ffmpeg5|ffmpeg6 is first in list
+    # relevant ffmpeg5|ffmpeg6 is first in list
     for package in ${packages}
     do
         if [ "$(echo ffmpeg${i} ${ffmpeg_dependent_packages} | grep -ow ${package})" != "" ]; then

cross/chromaprint/Makefile

@@ -1,9 +1,11 @@
 PKG_NAME = chromaprint
-PKG_VERS = 1.5.1
+PKG_VERS = 1.5.2
 PKG_EXT = tar.gz
-PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
-PKG_DIST_SITE = https://github.com/acoustid/chromaprint/releases/download/v$(PKG_VERS)
-PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
+PKG_GIT_HASH = aa67c95b9e486884a6d3ee8b0c91207d8c2b0551
+PKG_DIST_NAME = $(PKG_GIT_HASH).$(PKG_EXT)
+PKG_DIST_SITE = https://github.com/acoustid/chromaprint/archive
+PKG_DIST_FILE = $(PKG_NAME)-git$(PKG_GIT_HASH).$(PKG_EXT)
+PKG_DIR = $(PKG_NAME)-$(PKG_GIT_HASH)
 
 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.

cross/chromaprint/digests

@@ -1,3 +1,3 @@
-chromaprint-1.5.1.tar.gz SHA1 f54d8b58ff514ab65851d524237b38d8965cba57
-chromaprint-1.5.1.tar.gz SHA256 a1aad8fa3b8b18b78d3755b3767faff9abb67242e01b478ec9a64e190f335e1c
-chromaprint-1.5.1.tar.gz MD5 54e71f86bcf1d34989db639044ba9628
+chromaprint-gitaa67c95b9e486884a6d3ee8b0c91207d8c2b0551.tar.gz SHA1 3e85f4bd134263b1699b7e7412b1e089865185d7
+chromaprint-gitaa67c95b9e486884a6d3ee8b0c91207d8c2b0551.tar.gz SHA256 88e13f065e31d59d102339d956d0e2f99b125386e4d58ae7de6f09b90104b90f
+chromaprint-gitaa67c95b9e486884a6d3ee8b0c91207d8c2b0551.tar.gz MD5 80d7d474a585c186a6a3285465bfef1e

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/ffmpeg5
+OPTIONAL_DEPENDS = cross/ffmpeg$(FFMPEG_VERSION)
 
 HOMEPAGE = https://www.kaashoek.com/comskip
 COMMENT  = Commercial detector

cross/svt-av1/Makefile

@@ -1,5 +1,5 @@
 PKG_NAME = SVT-AV1
-PKG_VERS = 2.1.0
+PKG_VERS = 2.2.0
 PKG_EXT = tar.bz2
 PKG_DIST_NAME = $(PKG_NAME)-v$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://gitlab.com/AOMediaCodec/SVT-AV1/-/archive/v$(PKG_VERS)/

cross/svt-av1/PLIST

@@ -1,8 +1,4 @@
-bin:bin/SvtAv1DecApp
 bin:bin/SvtAv1EncApp
-lib:lib/libSvtAv1Dec.so.0.8.7
-lnk:lib/libSvtAv1Dec.so.0
-lnk:lib/libSvtAv1Dec.so
-lib:lib/libSvtAv1Enc.so.2.1.0
+lib:lib/libSvtAv1Enc.so.2.2.0
 lnk:lib/libSvtAv1Enc.so.2
 lnk:lib/libSvtAv1Enc.so

cross/svt-av1/digests

@@ -1,3 +1,3 @@
-SVT-AV1-v2.1.0.tar.bz2 SHA1 a92e38f6ab455891c59c028c1f5cd0a919040995
-SVT-AV1-v2.1.0.tar.bz2 SHA256 2bfd098770bba185cd1ced8e1ff389837e3dca0d8b5cfb0d97c925a61dbbf955
-SVT-AV1-v2.1.0.tar.bz2 MD5 79404543e5adbd5c23d537352e9f4ba6
+SVT-AV1-v2.2.0.tar.bz2 SHA1 d18c7d8adfa3b06c2c7db343291e45de1e95f8ec
+SVT-AV1-v2.2.0.tar.bz2 SHA256 9ebeda4602f9a3f851670e1a1cf922e05f44eef0d8f582f78c53e544c575e978
+SVT-AV1-v2.2.0.tar.bz2 MD5 9ebc6ca66bfc8a097fbd964c08e63278

spk/chromaprint/Makefile

@@ -1,6 +1,6 @@
 SPK_NAME = chromaprint
-SPK_VERS = 1.5.1
-SPK_REV = 20
+SPK_VERS = 1.5.2
+SPK_REV = 21
 SPK_ICON = src/chromaprint.png
 
 DEPENDS = cross/$(SPK_NAME)
@@ -10,13 +10,13 @@ STARTABLE = no
 MAINTAINER = ymartin59
 DESCRIPTION = 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.
 DISPLAY_NAME = Chromaprint
-CHANGELOG = "1. Update to version 1.5.1<br/>2. Update to using ffmpeg4 version 4.4.3"
+CHANGELOG = "1. Update to latest git hash 1.5.2 (aa67c95)<br/>2. Update to using ffmpeg5 version 5.1.5"
 
 HOMEPAGE   = https://acoustid.org/chromaprint
 LICENSE    = LGPL2.1+
 
 # Reuse FFmpeg libraries
-export FFMPEG_VERSION = 4
+export FFMPEG_VERSION = 5
 export FFMPEG_DIR = $(realpath $(shell pwd)/../ffmpeg$(FFMPEG_VERSION)/work-$(ARCH)-$(TCVERSION)/install/var/packages/ffmpeg$(subst 4,,$(FFMPEG_VERSION))/target)
 
 ifneq ($(wildcard $(FFMPEG_DIR)),)

spk/ffmpeg4/BROKEN

@@ -0,0 +1 @@
+Package no-longer maintained