Enable opencl on ffmpeg5-6 with DSM >= 7

.github/actions/build.sh

@@ -12,8 +12,9 @@
 # - 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.
-# - ffmpeg5 and ffmpeg6 are not cleaned to be available for dependents.
-# - Therefore ffmpeg5 and ffmpeg6 are built first if triggered by its
+# - synocli-videodriver and ffmpeg5-6 are not cleaned to be available for dependents.
+# - Therefore synocli-videodriver is built first if triggered by ffmpeg5-6
+# - Therefore ffmpeg5 and ffmpeg6 are built second if triggered by its
 #   own or a dependent (see prepare.sh).
 
 set -o pipefail
@@ -59,7 +60,7 @@ if [ -n "$API_KEY" ] && [ "$PUBLISH" == "true" ]; then
 fi
 
 # Build
-PACKAGES_TO_KEEP="ffmpeg5 ffmpeg6 python310 python311"
+PACKAGES_TO_KEEP="synocli-videodriver ffmpeg5 ffmpeg6 python310 python311"
 for package in ${build_packages}
 do
     echo "::group:: ---- build ${package}"

.github/actions/prepare.sh

@@ -6,7 +6,8 @@
 #
 # Functions:
 # - Evaluate all packages to build depending on files defined in ${GH_FILES}.
-# - python310, python311, ffmpeg5 and ffmpeg6 are moved to head of packages to build first if triggered by its own or a dependent.
+# - synocli-videodriver is moved to head of packages to build first if triggered by its ffmpeg5-6
+# - python310-311 and ffmpeg5-6 are moved to head of remaining packages to build when 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
@@ -53,12 +54,12 @@ 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 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
+    # If packages contain a package that depends on ffmpeg (or is ffmpeg),
+    # then ensure relevant ffmpeg5|ffmpeg6 is first in list
     for package in ${packages}
     do
         if [ "$(echo ffmpeg${i} ${ffmpeg_dependent_packages} | grep -ow ${package})" != "" ]; then
@@ -69,6 +70,20 @@ for i in {5..6}; do
     done
 done
 
+# for synocli-videodriver that ffmpeg v5-6 depends on
+videodrv_dependent_packages=$(find spk/ -maxdepth 2 -mindepth 2 -name "Makefile" -exec grep -Ho "spksrc.videodriver.mk" {} \; | grep -Po ".*spk/\K[^/]*" | sort | tr '\n' ' ')
+
+# If packages contain a package that depends on spksrc.videodriver.mk,
+# then ensure synocli-videodriver spk is first in list
+for package in ${packages}
+do
+    if [ "$(echo synocli-videodriver ${videodrv_dependent_packages} | grep -ow ${package})" != "" ]; then
+        packages_without_videodrv=$(echo "${packages}" | tr ' ' '\n' | grep -v "synocli-videodriver" | tr '\n' ' ')
+        packages="synocli-videodriver ${packages_without_videodrv}"
+        break
+    fi
+done
+
 # for python (310, 311) find all packages that depend on them
 for py in python310 python311; do
     python_dependent_packages=$(find spk/ -maxdepth 2 -mindepth 2 -name "Makefile" -exec grep -Ho "PYTHON_PACKAGE = ${py}" {} \; | grep -Po ".*spk/\K[^/]*" | sort | tr '\n' ' ')

cross/Khronos-OpenCL-Headers/Makefile

@@ -0,0 +1,19 @@
+PKG_NAME = OpenCL-Headers
+PKG_VERS = 2024.05.08
+PKG_EXT = tar.gz
+PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
+PKG_DIST_FILE = khronos-opencl-headers-$(PKG_VERS).$(PKG_EXT)
+PKG_DIST_SITE = https://github.com/KhronosGroup/OpenCL-Headers/archive/refs/tags
+PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
+
+HOMEPAGE = https://github.com/KhronosGroup/SPIRV-Headers
+COMMENT = Machine-readable files for the SPIR-V Registry
+LICENSE = Copyright (c) 2015-2024 The Khronos Group Inc.
+
+POST_EXTRACT_TARGET = SPIRV-Headers_post_extract_target
+
+include ../../mk/spksrc.cross-cmake.mk
+
+.PHONY: SPIRV-Headers_post_extract_target
+SPIRV-Headers_post_extract_target:
+	@cd $(WORK_DIR) && ln -s $(PKG_DIR) $(PKG_NAME)

cross/Khronos-OpenCL-Headers/digests

@@ -0,0 +1,3 @@
+khronos-opencl-headers-2024.05.08.tar.gz SHA1 188ef91da8210d120271a9b74b8b8858e897d9b8
+khronos-opencl-headers-2024.05.08.tar.gz SHA256 3c3dd236d35f4960028f4f58ce8d963fb63f3d50251d1e9854b76f1caab9a309
+khronos-opencl-headers-2024.05.08.tar.gz MD5 56d28bdc7957be155aa81114ce504794

cross/Khronos-SPIRV-Headers/Makefile

@@ -0,0 +1,18 @@
+PKG_NAME = SPIRV-Headers
+PKG_VERS = 1.3.283.0
+PKG_EXT = tar.gz
+PKG_DIST_NAME = vulkan-sdk-$(PKG_VERS).$(PKG_EXT)
+PKG_DIST_SITE = https://github.com/KhronosGroup/SPIRV-Headers/archive/refs/tags
+PKG_DIR = $(PKG_NAME)-vulkan-sdk-$(PKG_VERS)
+
+HOMEPAGE = https://github.com/KhronosGroup/SPIRV-Headers
+COMMENT = Machine-readable files for the SPIR-V Registry
+LICENSE = Copyright (c) 2015-2024 The Khronos Group Inc.
+
+POST_EXTRACT_TARGET = SPIRV-Headers_post_extract_target
+
+include ../../mk/spksrc.cross-cmake.mk
+
+.PHONY: SPIRV-Headers_post_extract_target
+SPIRV-Headers_post_extract_target:
+	@cd $(WORK_DIR) && ln -s $(PKG_DIR) $(PKG_NAME)

cross/Khronos-SPIRV-Headers/digests

@@ -0,0 +1,3 @@
+vulkan-sdk-1.3.283.0.tar.gz SHA1 b532efb95ddbcb28128897992a390767c6a93772
+vulkan-sdk-1.3.283.0.tar.gz SHA256 a68a25996268841073c01514df7bab8f64e2db1945944b45087e5c40eed12cb9
+vulkan-sdk-1.3.283.0.tar.gz MD5 5f258f65b4526c053d9ca3cddc94e71b

cross/Khronos-SPIRV-LLVM-Translator-140.src/Makefile

@@ -0,0 +1,39 @@
+PKG_NAME = SPIRV-LLVM-Translator
+PKG_LLVM_MAJ = 14
+PKG_LLVM_MIN = 0.3
+PKG_EXT = tar.gz
+PKG_DIST_NAME = v$(PKG_LLVM_MAJ).$(PKG_LLVM_MIN).$(PKG_EXT)
+PKG_DIST_FILE = $(PKG_NAME)-$(PKG_LLVM_MAJ).$(PKG_LLVM_MIN).$(PKG_EXT)
+PKG_DIST_SITE = https://github.com/KhronosGroup/SPIRV-LLVM-Translator/archive/refs/tags
+PKG_DIR = $(PKG_NAME)-$(PKG_LLVM_MAJ).$(PKG_LLVM_MIN)
+
+# llvm_release_140 branch is still receiving updates
+# using latest gis hash to ensure replicable builds
+#PKG_GIT_HASH = f23845001443049a9f1b0472b9a6f491aee46e3e
+#PKG_DIST_NAME = $(PKG_GIT_HASH).$(PKG_EXT)
+#PKG_DIST_FILE = $(PKG_NAME)-git$(PKG_GIT_HASH).$(PKG_EXT)
+#PKG_DIST_SITE = https://github.com/KhronosGroup/SPIRV-LLVM-Translator/archive
+#PKG_DIR = $(PKG_NAME)-$(PKG_GIT_HASH)
+
+# use below for direct llvm_release_140 branch
+#PKG_VERS = $(PKG_LLVM_MAJ)0
+#PKG_GIT_BRANCH = llvm_release_$(PKG_VERS)
+#PKG_DIST_NAME = $(PKG_GIT_BRANCH).$(PKG_EXT)
+#PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
+#PKG_DIST_SITE = https://github.com/KhronosGroup/SPIRV-LLVM-Translator/archive
+#PKG_DIR = $(PKG_NAME)-$(PKG_GIT_BRANCH)
+
+HOMEPAGE = https://github.com/KhronosGroup/SPIRV-LLVM-Translator
+COMMENT = Library and tool for translation between LLVM IR and SPIR-V.
+LICENSE = LLVM Release License
+
+POST_EXTRACT_TARGET = llvm_post_extract_target
+CONFIGURE_TARGET = nop
+COMPILE_TARGET = nop
+INSTALL_TARGET = nop
+
+include ../../mk/spksrc.cross-cmake.mk
+
+.PHONY: llvm_post_extract_target
+llvm_post_extract_target:
+	@cd $(WORK_DIR) && ln -s $(PKG_DIR) $(PKG_NAME)

cross/Khronos-SPIRV-LLVM-Translator-140.src/digests

@@ -0,0 +1,3 @@
+SPIRV-LLVM-Translator-14.0.3.tar.gz SHA1 7fb0a38086390b130ff3981d54a1bc89d3e4393d
+SPIRV-LLVM-Translator-14.0.3.tar.gz SHA256 c225f6929e5433c303c0f8f63a8e201322363c6817ebb1368ddb068279131ba7
+SPIRV-LLVM-Translator-14.0.3.tar.gz MD5 08f17fc6b891931d41049ad2bb2a7f51

cross/Khronos-SPIRV-Tools/Makefile

@@ -0,0 +1,31 @@
+PKG_NAME = SPIRV-Tools
+PKG_VERS = 2024.2
+PKG_EXT = tar.gz
+PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
+PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
+PKG_DIST_SITE = https://github.com/KhronosGroup/SPIRV-Tools/archive/refs/tags
+PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
+
+HOMEPAGE = https://github.com/KhronosGroup/SPIRV-Tools
+COMMENT = The SPIR-V Tools project provides an API and commands for processing SPIR-V modules.
+LICENSE = Apache-2.0 license
+
+BUILD_DEPENDS = cross/Khronos-SPIRV-Headers
+
+POST_EXTRACT_TARGET = SPIRV-Tools_post_extract_target
+
+CMAKE_ARGS += -DSPIRV_WERROR=OFF
+CMAKE_ARGS += -DSPIRV_TOOLS_BUILD_STATIC=OFF
+CMAKE_ARGS += -DSPIRV-Headers_SOURCE_DIR=$(WORK_DIR)/SPIRV-Headers
+
+include ../../mk/spksrc.cross-cmake.mk
+
+# Using gcc-8 we must use: make LDLIBS=-lstdc++fs
+# or by adding the following
+ifeq ($(call version_le, $(TC_GCC), 9),1)
+CMAKE_ARGS += -DCMAKE_CXX_STANDARD_LIBRARIES=-lstdc++fs
+endif
+
+.PHONY: SPIRV-Tools_post_extract_target
+SPIRV-Tools_post_extract_target:
+	@cd $(WORK_DIR) && ln -s $(PKG_DIR) $(PKG_NAME)

cross/Khronos-SPIRV-Tools/PLIST

@@ -0,0 +1,17 @@
+bin:bin/spirv-as
+bin:bin/spirv-cfg
+bin:bin/spirv-dis
+rsc:bin/spirv-lesspipe.sh
+bin:bin/spirv-link
+bin:bin/spirv-lint
+bin:bin/spirv-objdump
+bin:bin/spirv-opt
+bin:bin/spirv-reduce
+bin:bin/spirv-val
+lib:lib/libSPIRV-Tools-diff.so
+lib:lib/libSPIRV-Tools-link.so
+lib:lib/libSPIRV-Tools-lint.so
+lib:lib/libSPIRV-Tools-opt.so
+lib:lib/libSPIRV-Tools-reduce.so
+lib:lib/libSPIRV-Tools-shared.so
+lib:lib/libSPIRV-Tools.so

cross/Khronos-SPIRV-Tools/digests

@@ -0,0 +1,3 @@
+SPIRV-Tools-2024.2.tar.gz SHA1 1e838970271113e0191a37e6d1ab929de61d605b
+SPIRV-Tools-2024.2.tar.gz SHA256 58c5f4e6961c3d4936f7dbcd7f0b495c830b96972ee731452eaa9ade873f0095
+SPIRV-Tools-2024.2.tar.gz MD5 bde778ea43ee00f81ced9e441d69a0c9

cross/chromaprint/Makefile

@@ -1,34 +1,53 @@
 PKG_NAME = chromaprint
-PKG_VERS = 1.5.2
+PKG_VERS = 1.5.1
 PKG_EXT = tar.gz
-PKG_GIT_HASH = aa67c95b9e486884a6d3ee8b0c91207d8c2b0551
-PKG_DIST_NAME = $(PKG_GIT_HASH).$(PKG_EXT)
+PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(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)
+PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
+PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
+
+#PKG_GIT_HASH = aa67c95b9e486884a6d3ee8b0c91207d8c2b0551
+#PKG_DIST_NAME = $(PKG_GIT_HASH).$(PKG_EXT)
+#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.
 LICENSE  = LGPL2.1+
 
-OPTIONAL_DEPENDS = cross/ffmpeg$(FFMPEG_VERSION)
+OPTIONAL_DEPENDS = cross/ffmpeg6
 
 # compiler too old
 UNSUPPORTED_ARCHS = $(ARMv5_ARCHS) $(OLD_PPC_ARCHS)
 
-ifneq ($(wildcard $(FFMPEG_DIR)),)
-CMAKE_RPATH = /var/packages/ffmpeg$(subst 4,,$(FFMPEG_VERSION))/target/lib
+CMAKE_ARGS += -DBUILD_TOOLS=ON
+CMAKE_ARGS += -DBUILD_TESTS=OFF
+CMAKE_ARGS += -DCMAKE_CXX_FLAGS="-Wno-deprecated-declarations"
+
+ifneq ($(wildcard $(FFMPEG_PACKAGE_ROOT)),)
+CMAKE_ARGS += -DCMAKE_INSTALL_RPATH=$(FFMPEG_PREFIX)/lib
+
+# Location of FFMPEG Headers
+CMAKE_ARGS += -DFFMPEG_LIBAVCODEC_FFT_INCLUDE_DIRS:PATH=$(FFMPEG_STAGING_PREFIX)/include
+CMAKE_ARGS += -DFFMPEG_LIBAVCODEC_FFT_LIBRARIES:FILEPATH=$(FFMPEG_STAGING_PREFIX)/lib/libavcodec.so
+CMAKE_ARGS += -DFFMPEG_LIBAVCODEC_INCLUDE_DIRS:PATH=$(FFMPEG_STAGING_PREFIX)/include
+CMAKE_ARGS += -DFFMPEG_LIBAVCODEC_LIBRARIES:FILEPATH=$(FFMPEG_STAGING_PREFIX)/lib/libavcodec.so
+CMAKE_ARGS += -DFFMPEG_LIBAVDEVICE_INCLUDE_DIRS:PATH=$(FFMPEG_STAGING_PREFIX)/include
+CMAKE_ARGS += -DFFMPEG_LIBAVDEVICE_LIBRARIES:FILEPATH=$(FFMPEG_STAGING_PREFIX)/lib/libavdevice.so
+CMAKE_ARGS += -DFFMPEG_LIBAVFORMAT_INCLUDE_DIRS:PATH=$(FFMPEG_STAGING_PREFIX)/include
+CMAKE_ARGS += -DFFMPEG_LIBAVFORMAT_LIBRARIES:FILEPATH=$(FFMPEG_STAGING_PREFIX)/lib/libavformat.so
+#CMAKE_ARGS += -DFFMPEG_LIBAVRESAMPLE_INCLUDE_DIRS:PATH=$(FFMPEG_STAGING_PREFIX)/include
+#CMAKE_ARGS += -DFFMPEG_LIBAVRESAMPLE_LIBRARIES:FILEPATH=$(FFMPEG_STAGING_PREFIX)/lib/libswresample.so
+CMAKE_ARGS += -DFFMPEG_LIBAVUTIL_INCLUDE_DIRS:PATH=$(FFMPEG_STAGING_PREFIX)/include
+CMAKE_ARGS += -DFFMPEG_LIBAVUTIL_LIBRARIES:FILEPATH=$(FFMPEG_STAGING_PREFIX)/lib/libavutil.so
+CMAKE_ARGS += -DFFMPEG_LIBSWRESAMPLE_INCLUDE_DIRS:PATH=$(FFMPEG_STAGING_PREFIX)/include
+CMAKE_ARGS += -DFFMPEG_LIBSWRESAMPLE_LIBRARIES:FILEPATH=$(FFMPEG_STAGING_PREFIX)/lib/libswresample.so
+CMAKE_ARGS += -DFFMPEG_LIBSWSCALE_INCLUDE_DIRS:PATH=$(FFMPEG_STAGING_PREFIX)/include
+CMAKE_ARGS += -DFFMPEG_LIBSWSCALE_LIBRARIES:FILEPATH=$(FFMPEG_STAGING_PREFIX)/lib/libswscale.so
+
 else
-DEPENDS = cross/ffmpeg$(FFMPEG_VERSION)
+DEPENDS = cross/ffmpeg6
 CMAKE_RPATH =
 endif
 
-CMAKE_BUILD_DIR = $(WORK_DIR)/$(PKG_DIR)
-CMAKE_USE_TOOLCHAIN_FILE = OFF
-
 include ../../mk/spksrc.cross-cmake.mk
-
-CMAKE_ARGS += -DBUILD_TOOLS=ON
-CMAKE_ARGS += -DBUILD_TESTS=OFF
-CMAKE_ARGS += -DCMAKE_INSTALL_RPATH=$(CMAKE_RPATH)
-CMAKE_ARGS += -DCMAKE_CXX_FLAGS="-Wno-deprecated-declarations"

cross/chromaprint/digests

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