Browse Source

- ffmpeg: fix dependencies

master
vanhofen 4 years ago
parent
commit
4dcbce0f11
  1. 4
      make/target-ffmpeg-coolstream.mk
  2. 4
      make/target-ffmpeg.mk

4
make/target-ffmpeg-coolstream.mk

@ -7,6 +7,8 @@ FFMPEG_BRANCH ?= ni/ffmpeg/2.8
#FFMPEG_BRANCH ?= ni/ffmpeg/master
#FFMPEG_BRANCH ?= ffmpeg/master
FFMPEG_DEPENDENCIES = openssl rtmpdump libbluray libass
FFMPEG_CONF_OPTS = \
--prefix=$(prefix) \
--cross-prefix=$(TARGET_CROSS) \
@ -138,8 +140,6 @@ FFMPEG_CONF_OPTS = \
--arch=$(TARGET_ARCH) \
--extra-ldflags="$(TARGET_LDFLAGS)"
FFMPEG_DEPENDENCIES = openssl rtmpdump libbluray libass
ifeq ($(FFMPEG_BRANCH),ni/ffmpeg/2.8)
FFMPEG_DEPENDENCIES += libroxml
else

4
make/target-ffmpeg.mk

@ -11,6 +11,8 @@ FFMPEG_SITE = http://www.ffmpeg.org/releases
$(DL_DIR)/$(FFMPEG_SOURCE):
$(DOWNLOAD) $(FFMPEG_SITE)/$(FFMPEG_SOURCE)
FFMPEG_DEPENDENCIES = openssl freetype rtmpdump libbluray libass libxml2 alsa-lib
FFMPEG_UNPATCHED := no
FFMPEG_CONF_OPTS = \
@ -337,8 +339,6 @@ else ifeq ($(TARGET_ARCH),mips)
--extra-cflags="-Wno-deprecated-declarations -I$(TARGET_includedir)"
endif
FFMPEG_DEPENDENCIES = openssl freetype rtmpdump libbluray libass libxml2 alsa-lib
ffmpeg: $(FFMPEG_DEPENDENCIES) $(DL_DIR)/$(FFMPEG_SOURCE) | $(TARGET_DIR)
$(REMOVE)/$(PKG_DIR)
$(UNTAR)/$(PKG_SOURCE)

Loading…
Cancel
Save