From 92e8e560697462225cade864cbffc4eed7ab0037 Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Sat, 19 Jul 2014 07:56:59 -0700 Subject: [PATCH 1/2] 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 --- multimedia/ffmpeg/Makefile | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) 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)) From 875eb1cc24de3da9a4ceef9dc691be11a951e7a7 Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Sat, 19 Jul 2014 08:46:30 -0700 Subject: [PATCH 2/2] ffmpeg: remember to adjust InstallDev too Finish adjustment for libavdevice with libffmpeg-mini Signed-off-by: Ian Leonard --- multimedia/ffmpeg/Makefile | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index 7fe9632b51..be90b3ebc3 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -512,7 +512,15 @@ define Build/InstallDev/full $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/lib{avcodec,avdevice,avfilter,avformat,avutil,postproc,swresample,swscale}.pc $(1)/usr/lib/pkgconfig/ endef -Build/InstallDev/mini = $(Build/InstallDev/custom) +define Build/InstallDev/mini + $(INSTALL_DIR) $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/lib{avcodec,avformat,avutil} $(1)/usr/include/ + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{avcodec,avformat,avutil}.{a,so*} $(1)/usr/lib/ + $(INSTALL_DIR) $(1)/usr/lib/pkgconfig + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/lib{avcodec,avformat,avutil}.pc $(1)/usr/lib/pkgconfig/ +endef + Build/InstallDev/audio-dec = $(Build/InstallDev/custom) # XXX: attempt at installing "best" dev files available