From 78b7bbbfa60bbe165b7b38025f2d5db887877191 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sun, 22 Mar 2020 17:10:15 -0700 Subject: [PATCH] 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 --- multimedia/ffmpeg/Makefile | 5 +++-- 1 file 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