From 5f0267fcd9cbbcd08465627776cf3399f813d53a Mon Sep 17 00:00:00 2001 From: hgy59 Date: Sat, 18 Jan 2025 09:41:59 +0100 Subject: [PATCH] prepare redesign of dependency list - some changes taken from PR #6255 to reduce number of dependent packages - changes that trigger ffmpeg* - changes that trigger python311 (except vim, separated in PR #6398) --- cross/znc/Makefile | 2 +- spk/chromaprint/Makefile | 2 +- spk/comskip/Makefile | 2 +- spk/ffmpeg5/Makefile | 2 +- spk/ffmpeg6/Makefile | 2 +- spk/ffmpeg7/Makefile | 2 +- spk/znc/Makefile | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cross/znc/Makefile b/cross/znc/Makefile index 99da7b40537..e63cadf6aaf 100644 --- a/cross/znc/Makefile +++ b/cross/znc/Makefile @@ -9,7 +9,7 @@ ifeq ($(strip $(PYTHON_PACKAGE)),) PYTHON_PACKAGE = python311 endif -BUILD_DEPENDS = cross/$(PYTHON_PACKAGE) +BUILD_DEPENDS = cross/python311 DEPENDS = cross/openssl3 cross/libicu cross/zlib # configure: No compiler with C++11 support was found diff --git a/spk/chromaprint/Makefile b/spk/chromaprint/Makefile index 59a494e570b..66d3b7cbc8f 100644 --- a/spk/chromaprint/Makefile +++ b/spk/chromaprint/Makefile @@ -4,7 +4,7 @@ SPK_REV = 22 SPK_ICON = src/chromaprint.png FFMPEG_PACKAGE = ffmpeg7 -DEPENDS = cross/$(SPK_NAME) +DEPENDS = cross/chromaprint SPK_DEPENDS = $(FFMPEG_PACKAGE) # ffmpeg7 requires c11 support diff --git a/spk/comskip/Makefile b/spk/comskip/Makefile index 3029cf522cd..8c2cac4b2a8 100644 --- a/spk/comskip/Makefile +++ b/spk/comskip/Makefile @@ -4,7 +4,7 @@ SPK_REV = 12 SPK_ICON = src/comskip.png FFMPEG_PACKAGE = ffmpeg5 -DEPENDS = cross/$(SPK_NAME) +DEPENDS = cross/comskip SPK_DEPENDS = $(FFMPEG_PACKAGE) STARTABLE = no diff --git a/spk/ffmpeg5/Makefile b/spk/ffmpeg5/Makefile index b4bf92f0e25..ad688456c13 100644 --- a/spk/ffmpeg5/Makefile +++ b/spk/ffmpeg5/Makefile @@ -4,7 +4,7 @@ SPK_REV = 6 SPK_ICON = src/ffmpeg.png CHANGELOG = "1. Update to version 5.1.6" -DEPENDS = cross/$(SPK_NAME) +DEPENDS = cross/ffmpeg5 MAINTAINER = th0ma7 DESCRIPTION = FFmpeg is a complete, cross-platform solution to record, convert and stream audio and video. It includes libavcodec - the leading audio/video codec library. More information from SynoCommunity FFmpeg package available at https://github.com/SynoCommunity/spksrc/wiki/FAQ-FFmpeg diff --git a/spk/ffmpeg6/Makefile b/spk/ffmpeg6/Makefile index 23e7b391801..b953d1cf4ec 100644 --- a/spk/ffmpeg6/Makefile +++ b/spk/ffmpeg6/Makefile @@ -4,7 +4,7 @@ SPK_REV = 5 SPK_ICON = src/ffmpeg.png CHANGELOG = "1. Update to version 6.0.1
2. Update Jellyfin upstream patches
3. Update Intel Media Driver 2024Q2 Release (DSM7 only)
4. Revert DSM7 to MFX intead of Intel Video Processing Library (Intel-VPL) as unsupported by Jellyfin
5. Enable OpenCL on Intel platforms (DSM7 only)
6. Update to latest version of x264 (fix for \#6176)
6. Now using new synocli-videodriver package" -DEPENDS = cross/$(SPK_NAME) +DEPENDS = cross/ffmpeg6 MAINTAINER = th0ma7 DESCRIPTION = FFmpeg is a complete, cross-platform solution to record, convert and stream audio and video. It includes libavcodec - the leading audio/video codec library. More information from SynoCommunity FFmpeg package available at https://github.com/SynoCommunity/spksrc/wiki/FAQ-FFmpeg diff --git a/spk/ffmpeg7/Makefile b/spk/ffmpeg7/Makefile index 8db2dfa9b69..7a13d1be9a7 100644 --- a/spk/ffmpeg7/Makefile +++ b/spk/ffmpeg7/Makefile @@ -4,7 +4,7 @@ SPK_REV = 1 SPK_ICON = src/ffmpeg.png CHANGELOG = "1. Initial release of version 7 release" -DEPENDS = cross/$(SPK_NAME) +DEPENDS = cross/ffmpeg7 # requires c11 support UNSUPPORTED_ARCHS = $(ARMv5_ARCHS) $(OLD_PPC_ARCHS) diff --git a/spk/znc/Makefile b/spk/znc/Makefile index f5f578316ef..92ba693dbf9 100644 --- a/spk/znc/Makefile +++ b/spk/znc/Makefile @@ -4,7 +4,7 @@ SPK_REV = 23 SPK_ICON = src/znc.png DSM_UI_DIR = app -DEPENDS = cross/$(SPK_NAME) +DEPENDS = cross/znc PYTHON_PACKAGE = python311 SPK_DEPENDS = "python311>=3.11.5-8"