From c2cc90a3ddaf8df625ac7772ef3d05cdd0d5cfa7 Mon Sep 17 00:00:00 2001 From: Ted Hess Date: Tue, 2 Oct 2018 15:00:39 -0400 Subject: [PATCH] ffmpeg: Configuration fixes for optional codec libraries Signed-off-by: Ted Hess --- multimedia/ffmpeg/Makefile | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index f627db8f9..6d3d87618 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ffmpeg PKG_VERSION:=3.2.12 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://ffmpeg.org/releases/ @@ -342,13 +342,10 @@ endef define Package/libffmpeg-full $(call Package/libffmpeg/Default) TITLE+= (full) - DEPENDS+= +alsa-lib +PACKAGE_libopus:libopus - ifeq ($(CONFIG_SOFT_FLOAT),y) - DEPENDS+= +PACKAGE_shine:shine - else - DEPENDS+= +PACKAGE_lame-lib:lame-lib +PACKAGE_libx264:libx264 +PACKAGE_fdk-aac:fdk-aac - - endif + DEPENDS+= +alsa-lib +PACKAGE_libopus:libopus \ + $(if $$(CONFIG_SOFT_FLOAT),\ + +PACKAGE_shine:shine,\ + +PACKAGE_lame-lib:lame-lib +PACKAGE_libx264:libx264 +PACKAGE_fdk-aac:fdk-aac) VARIANT:=full endef