Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #11630 from neheb/nbmv

Browse source 
ffmpeg: add dependency to fdk-aac for ffmpeg-full
This commit is contained in:
Rosen Penev 2020-03-23 12:19:03 -07:00 committed by GitHub
commit 73b75ed106
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
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