Skip to content

Commit

Permalink
prepare redesign of dependency list (SynoCommunity#6402)
Browse files Browse the repository at this point in the history
- some changes taken from PR SynoCommunity#6255 to reduce number of dependent packages
- changes that trigger ffmpeg*
- changes that trigger python311 (except vim, separated in PR SynoCommunity#6398)
  • Loading branch information
hgy59 authored Jan 18, 2025
1 parent 6d20738 commit d92586f
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion cross/znc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion spk/chromaprint/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion spk/comskip/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion spk/ffmpeg5/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion spk/ffmpeg6/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ SPK_REV = 5
SPK_ICON = src/ffmpeg.png
CHANGELOG = "1. Update to version 6.0.1<br/>2. Update Jellyfin upstream patches<br/>3. Update Intel Media Driver 2024Q2 Release (DSM7 only)<br/>4. Revert DSM7 to MFX intead of Intel Video Processing Library (Intel-VPL) as unsupported by Jellyfin<br/>5. Enable OpenCL on Intel platforms (DSM7 only)<br/>6. Update to latest version of x264 (fix for \#6176)<br/>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
Expand Down
2 changes: 1 addition & 1 deletion spk/ffmpeg7/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion spk/znc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down

0 comments on commit d92586f

Please sign in to comment.