diff options
| author | Ted Hess <thess@kitschensync.net> | 2018-11-08 18:51:36 -0500 |
|---|---|---|
| committer | Ted Hess <thess@kitschensync.net> | 2018-11-09 13:32:28 -0500 |
| commit | b4d191995c5fc5f9d0c5f2077e600d8154bc4cf7 (patch) | |
| tree | c6309780ffa37e095f60f443808ecf15f5f7a35e /multimedia/ffmpeg | |
| parent | 4453a8d30e7eac6dde033404852d0d77746783f7 (diff) | |
ffmpeg: Resolve hard/float builds with work-around dependencies
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>
Diffstat (limited to 'multimedia/ffmpeg')
| -rw-r--r-- | multimedia/ffmpeg/Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index 6d3d87618..ab7bf478a 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:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://ffmpeg.org/releases/ @@ -278,7 +278,7 @@ endef define Package/ffserver -$(call Package/ffserver/Default) +$(call Package/ffmpeg/Default) SECTION:=multimedia CATEGORY:=Multimedia TITLE+= streaming server @@ -343,9 +343,9 @@ define Package/libffmpeg-full $(call Package/libffmpeg/Default) TITLE+= (full) 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) + +SOFT_FLOAT:shine \ + +!SOFT_FLOAT:lame-lib \ + +!SOFT_FLOAT:libx264 VARIANT:=full endef |