mirror
/
openwrt-packages
mirror of https://git.openwrt.org/feed/packages.git
1
0
Fork 0
Code Releases Activity

ffmpeg: Dependency cleanup 

Custom builds need to select x264 and/or lame-lib explictly. Automatic
CONFIG_ALL builds of ffmpeg-full include x264 and lame.

Signed-off-by: Ted Hess <thess@kitschensync.net>
This commit is contained in:
Ted Hess 2016-08-19 18:40:41 -04:00
parent d875334e5e
commit ec133992b7
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
multimedia/ffmpeg/Config.in
View File

@ -113,6 +113,7 @@ comment "External Libraries"
config FFMPEG_CUSTOM_SELECT_mp3lame config FFMPEG_CUSTOM_SELECT_mp3lame
bool "MP3 LAME" bool "MP3 LAME"
depends on FFMPEG_CUSTOM_PATENTED depends on FFMPEG_CUSTOM_PATENTED
depends on PACKAGE_lame-lib
select FFMPEG_CUSTOM_DECODER_mp3 select FFMPEG_CUSTOM_DECODER_mp3
select FFMPEG_CUSTOM_MUXER_mp3 select FFMPEG_CUSTOM_MUXER_mp3
select FFMPEG_CUSTOM_DEMUXER_mp3 select FFMPEG_CUSTOM_DEMUXER_mp3
@ -124,8 +125,9 @@ config FFMPEG_CUSTOM_SELECT_speex
bool "Speex" bool "Speex"
config FFMPEG_CUSTOM_SELECT_x264 config FFMPEG_CUSTOM_SELECT_x264
depends on FFMPEG_CUSTOM_PATENTED
bool "x264" bool "x264"
depends on FFMPEG_CUSTOM_PATENTED
depends on PACKAGE_libx264
select FFMPEG_CUSTOM_DECODER_h264 select FFMPEG_CUSTOM_DECODER_h264
select FFMPEG_CUSTOM_MUXER_h264 select FFMPEG_CUSTOM_MUXER_h264
select FFMPEG_CUSTOM_DEMUXER_h264 select FFMPEG_CUSTOM_DEMUXER_h264

15
multimedia/ffmpeg/Makefile
View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=ffmpeg PKG_NAME:=ffmpeg
PKG_VERSION:=2.8.7 PKG_VERSION:=2.8.7
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=http://ffmpeg.org/releases/ PKG_SOURCE_URL:=http://ffmpeg.org/releases/
@ -291,7 +291,8 @@ define Package/libffmpeg-custom
$(call Package/libffmpeg/Default) $(call Package/libffmpeg/Default)
TITLE+= (custom) TITLE+= (custom)
DEPENDS+= +FFMPEG_CUSTOM_SELECT_libopus:libopus +FFMPEG_CUSTOM_SELECT_speex:libspeex \ DEPENDS+= +FFMPEG_CUSTOM_SELECT_libopus:libopus +FFMPEG_CUSTOM_SELECT_speex:libspeex \
+FFMPEG_CUSTOM_SELECT_x264:libx264 +FFMPEG_CUSTOM_SELECT_mp3lame:lame-lib +PACKAGE_libx264:libx264 +PACKAGE_lame-lib:lame-lib
VARIANT:=custom VARIANT:=custom
MENU:=1 MENU:=1
endef endef
@ -324,7 +325,7 @@ endef
define Package/libffmpeg-full define Package/libffmpeg-full
$(call Package/libffmpeg/Default) $(call Package/libffmpeg/Default)
TITLE+= (full) TITLE+= (full)
DEPENDS+= +alsa-lib +libx264 +lame-lib +libopus +libspeex DEPENDS+= +alsa-lib +PACKAGE_libx264:libx264 +PACKAGE_lame-lib:lame-lib +libopus +libspeex
VARIANT:=full VARIANT:=full
endef endef
@ -423,8 +424,8 @@ ifeq ($(BUILD_VARIANT),full)
FFMPEG_CONFIGURE+= \ FFMPEG_CONFIGURE+= \
--enable-libopus --enable-decoder=libopus \ --enable-libopus --enable-decoder=libopus \
--enable-libspeex --enable-decoder=libspeex \ --enable-libspeex --enable-decoder=libspeex \
--enable-libx264 \ $(if $(CONFIG_PACKAGE_libx264),--enable-libx264) \
--enable-libmp3lame $(if $(CONFIG_PACKAGE_lame-lib),--enable-libmp3lame)
endif endif
ifeq ($(BUILD_VARIANT),custom) ifeq ($(BUILD_VARIANT),custom)
@ -468,12 +469,12 @@ endif
ifeq ($(CONFIG_FFMPEG_CUSTOM_SELECT_x264),y) ifeq ($(CONFIG_FFMPEG_CUSTOM_SELECT_x264),y)
FFMPEG_CONFIGURE+= \ FFMPEG_CONFIGURE+= \
--enable-libx264 --enable-decoder=libx264 --enable-libx264
endif endif
ifeq ($(CONFIG_FFMPEG_CUSTOM_SELECT_mp3lame),y) ifeq ($(CONFIG_FFMPEG_CUSTOM_SELECT_mp3lame),y)
FFMPEG_CONFIGURE+= \ FFMPEG_CONFIGURE+= \
--enable-libmp3lame --enable-encoder=mp3 --enable-libmp3lame
endif endif
endif endif