diff options
| author | Rosen Penev <rosenp@gmail.com> | 2020-03-22 17:10:15 -0700 |
|---|---|---|
| committer | Rosen Penev <rosenp@gmail.com> | 2020-03-22 18:07:04 -0700 |
| commit | 78b7bbbfa60bbe165b7b38025f2d5db887877191 (patch) | |
| tree | fb37f9af767631bc59d93c829826eabcc40a56b2 /multimedia | |
| parent | 81c3e2dfa4774e23be3a38b8b514bc4400916ad7 (diff) | |
ffmpeg: add dependency to fdk-aac for ffmpeg-full
Since getting rid of the patented line, it seems fdk-aac is now getting
enabled for -full, causing a missing dependency. OTOH, fdk-aac can only be
enabled if x264 is not. So add a ! dependency for it.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/ffmpeg/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index 5418ae510..a5c04e7bc 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ffmpeg PKG_VERSION:=3.4.7 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://ffmpeg.org/releases/ @@ -374,7 +374,8 @@ $(call Package/libffmpeg/Default) DEPENDS+= +alsa-lib +PACKAGE_libopus:libopus \ +SOFT_FLOAT:shine \ +!SOFT_FLOAT:lame-lib \ - +PACKAGE_libx264:libx264 + +PACKAGE_libx264:libx264 \ + +!PACKAGE_libx264:fdk-aac VARIANT:=full endef |