From: Ian Leonard <antonlacon@gmail.com>
Date: Sat, 19 Jul 2014 14:56:59 +0000 (-0700)
Subject: ffmpeg: remove libavdevice from the libffmpeg-mini variant
X-Git-Tag: v14.07~80^2~1
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=92e8e560697462225cade864cbffc4eed7ab0037;p=feed%2Fpackages.git

ffmpeg: remove libavdevice from the libffmpeg-mini variant

As libffmpeg-mini is intended for DLNA purposes, it needs only
to identify media, not interact with input or output devices.

Signed-off-by: Ian Leonard <antonlacon@gmail.com>
---

diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 81112cfdca..7fe9632b51 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ffmpeg
 PKG_VERSION:=0.11.5
-PKG_RELEASE:=4
+PKG_RELEASE:=5
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://ffmpeg.org/releases/
@@ -300,7 +300,7 @@ endef
 
 define Package/libffmpeg-custom
 $(call Package/libffmpeg/Default)
- TITLE+= (mini)
+ TITLE+= (custom)
  DEPENDS+= @DEVEL +libspeex
  VARIANT:=custom
  MENU:=1
@@ -465,6 +465,7 @@ ifeq ($(BUILD_VARIANT),mini)
 	--disable-ffplay \
 	--disable-ffprobe \
 	--disable-ffserver \
+	--disable-avdevice \
 	--disable-avfilter \
 	--disable-postproc \
 	--disable-swresample \
@@ -563,7 +564,11 @@ define Package/libffmpeg-full/install
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{avcodec,avdevice,avfilter,avformat,avutil,postproc,swresample,swscale}.so.* $(1)/usr/lib/
 endef
 
-Package/libffmpeg-mini/install = $(Package/libffmpeg-custom/install)
+define Package/libffmpeg-mini/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{avcodec,avformat,avutil}.so.* $(1)/usr/lib/
+endef
+
 Package/libffmpeg-audio-dec/install = $(Package/libffmpeg-custom/install)
 
 $(eval $(call BuildPackage,ffmpeg))