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

ffmpeg: Resolve hard/float builds with work-around dependencies

Browse source 
Hard float includes: libx264, mp3lame
Soft float includes: shine (mp3 encoder)

fdk-aac will not be available in libffmpeg-full due to incompatible license with libx264.
Custom builds can override licensing restrictions but results may not be re-distributable.

Signed-off-by: Ted Hess <thess@kitschensync.net>
This commit is contained in:
Ted Hess 2018-11-08 18:51:36 -05:00
parent 4453a8d30e
commit b4d191995c
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
multimedia/ffmpeg/Makefile
View file

@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=ffmpeg PKG_NAME:=ffmpeg
PKG_VERSION:=3.2.12 PKG_VERSION:=3.2.12
PKG_RELEASE:=2 PKG_RELEASE:=3
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/
@ -278,7 +278,7 @@ endef
define Package/ffserver define Package/ffserver
$(call Package/ffserver/Default) $(call Package/ffmpeg/Default)
SECTION:=multimedia SECTION:=multimedia
CATEGORY:=Multimedia CATEGORY:=Multimedia
TITLE+= streaming server TITLE+= streaming server
@ -343,9 +343,9 @@ define Package/libffmpeg-full
$(call Package/libffmpeg/Default) $(call Package/libffmpeg/Default)
TITLE+= (full) TITLE+= (full)
DEPENDS+= +alsa-lib +PACKAGE_libopus:libopus \ DEPENDS+= +alsa-lib +PACKAGE_libopus:libopus \
$(if $$(CONFIG_SOFT_FLOAT),\ +SOFT_FLOAT:shine \
+PACKAGE_shine:shine,\ +!SOFT_FLOAT:lame-lib \
+PACKAGE_lame-lib:lame-lib +PACKAGE_libx264:libx264 +PACKAGE_fdk-aac:fdk-aac) +!SOFT_FLOAT:libx264
VARIANT:=full VARIANT:=full
endef endef