Browse Source

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>
lilik-openwrt-22.03
Rosen Penev 5 years ago
parent
commit
78b7bbbfa6
No known key found for this signature in database GPG Key ID: 36D31CFA845F0E3B
1 changed files with 3 additions and 2 deletions
  1. +3
    -2
      multimedia/ffmpeg/Makefile

+ 3
- 2
multimedia/ffmpeg/Makefile View File

@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=ffmpeg PKG_NAME:=ffmpeg
PKG_VERSION:=3.4.7 PKG_VERSION:=3.4.7
PKG_RELEASE:=3
PKG_RELEASE:=4
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://ffmpeg.org/releases/ PKG_SOURCE_URL:=https://ffmpeg.org/releases/
@ -374,7 +374,8 @@ $(call Package/libffmpeg/Default)
DEPENDS+= +alsa-lib +PACKAGE_libopus:libopus \ DEPENDS+= +alsa-lib +PACKAGE_libopus:libopus \
+SOFT_FLOAT:shine \ +SOFT_FLOAT:shine \
+!SOFT_FLOAT:lame-lib \ +!SOFT_FLOAT:lame-lib \
+PACKAGE_libx264:libx264
+PACKAGE_libx264:libx264 \
+!PACKAGE_libx264:fdk-aac
VARIANT:=full VARIANT:=full
endef endef


Loading…
Cancel
Save