X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=multimedia%2Fffmpeg%2FMakefile;h=5a5699d0f63a822d91f2502cc37b3c2580de2e6a;hb=0b85eb9822f67f3e21050539713033da8e58d3a1;hp=36592b8f86ca554cb3e1e3c2ba2884ed00897fa8;hpb=1951711b7284f217eabd466d6ea28231b0e7b0d2;p=packages.git

diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 36592b8f8..5a5699d0f 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2010 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,14 +8,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ffmpeg
-PKG_VERSION:=0.5.2
-PKG_RELEASE:=4
+PKG_VERSION:=0.8.7
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://ffmpeg.org/releases/
-PKG_MD5SUM:=451eb428ca97a72c00555d50944cdb24
+PKG_MD5SUM:=31da4d5610d7138761e23fab8fe3a84d
 
-FFMPEG_ENCODERS:= \
+FFMPEG_CUSTOM_ENCODERS:= \
 	ac3 \
 	jpegls \
 	mpeg1video \
@@ -27,10 +27,11 @@ FFMPEG_ENCODERS:= \
 	vorbis \
 	zlib \
 
-FFMPEG_DECODERS:= \
+FFMPEG_CUSTOM_DECODERS:= \
 	aac \
 	ac3 \
 	atrac3 \
+	flac \
 	gif \
 	h264 \
 	jpegls \
@@ -39,7 +40,6 @@ FFMPEG_DECODERS:= \
 	mpeg1video \
 	mpeg2video \
 	mpeg4 \
-	mpeg4aac \
 	mpegvideo \
 	pcm_s16be \
 	pcm_s16le \
@@ -49,7 +49,7 @@ FFMPEG_DECODERS:= \
 	wmav2 \
 	zlib \
 
-FFMPEG_MUXERS:= \
+FFMPEG_CUSTOM_MUXERS:= \
 	ac3 \
 	ffm \
 	h264 \
@@ -59,13 +59,17 @@ FFMPEG_MUXERS:= \
 	mpeg2video \
 	mpegts \
 	ogg \
-	oss \
 	rtp \
 
-FFMPEG_DEMUXERS:= \
+FFMPEG_CUSTOM_DEMUXERS:= \
+	aac \
 	ac3 \
+	avi \
+	flac \
 	ffm \
 	h264 \
+	matroska \
+	mov \
 	mp3 \
 	mpegps \
 	mpegts \
@@ -76,24 +80,74 @@ FFMPEG_DEMUXERS:= \
 	sdp \
 	v4l2 \
 
-FFMPEG_PARSERS:= \
+FFMPEG_CUSTOM_PARSERS:= \
 	aac \
 	ac3 \
 	h264 \
 	mpegaudio \
-	mpegvideo \
 	mpeg4video \
+	mpegvideo \
 
-FFMPEG_PROTOCOLS:= \
+FFMPEG_CUSTOM_PROTOCOLS:= \
 	file http pipe rtp tcp udp
 
+FFMPEG_MINI_ENCODERS:= \
+
+FFMPEG_MINI_DECODERS:= \
+	aac \
+	ac3 \
+	atrac3 \
+	flac \
+	h263 \
+	h264 \
+	jpegls \
+	mp3 \
+	mpeg1video \
+	mpeg2video \
+	mpeg4 \
+	mpegvideo \
+	png \
+	wmav1 \
+	wmav2 \
+
+FFMPEG_MINI_MUXERS:= \
+	ffm \
+
+FFMPEG_MINI_DEMUXERS := \
+	aac \
+	ac3 \
+	asf \
+	avi \
+	ffm \
+	flac \
+	h264 \
+	matroska \
+	mov \
+	mp3 \
+	mpegts \
+	mpegvideo \
+	rtsp \
+
+FFMPEG_MINI_PARSERS:= \
+	ac3 \
+	flac \
+	h263 \
+	h264 \
+	mpeg4video \
+	mpegaudio \
+
+FFMPEG_MINI_PROTOCOLS := \
+	file http rtp tcp udp \
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
+
 PKG_CONFIG_DEPENDS:= \
-	$(patsubst %,CONFIG_FFMPEG_ENCODER_%,$(FFMPEG_ENCODERS)) \
-	$(patsubst %,CONFIG_FFMPEG_DECODER_%,$(FFMPEG_DECODERS)) \
-	$(patsubst %,CONFIG_FFMPEG_MUXER_%,$(FFMPEG_DEMUXERS)) \
-	$(patsubst %,CONFIG_FFMPEG_DEMUXER_%,$(FFMPEG_DEMUXERS)) \
-	$(patsubst %,CONFIG_FFMPEG_PARSER_%,$(FFMPEG_PARSERS)) \
-	$(patsubst %,CONFIG_FFMPEG_PROTOCOL_%,$(FFMPEG_PROTOCOLS))
+	$(patsubst %,CONFIG_FFMPEG_CUSTOM_ENCODER_%,$(FFMPEG_CUSTOM_ENCODERS)) \
+	$(patsubst %,CONFIG_FFMPEG_CUSTOM_DECODER_%,$(FFMPEG_CUSTOM_DECODERS)) \
+	$(patsubst %,CONFIG_FFMPEG_CUSTOM_MUXER_%,$(FFMPEG_CUSTOM_DEMUXERS)) \
+	$(patsubst %,CONFIG_FFMPEG_CUSTOM_DEMUXER_%,$(FFMPEG_CUSTOM_DEMUXERS)) \
+	$(patsubst %,CONFIG_FFMPEG_CUSTOM_PARSER_%,$(FFMPEG_CUSTOM_PARSERS)) \
+	$(patsubst %,CONFIG_FFMPEG_CUSTOM_PROTOCOL_%,$(FFMPEG_CUSTOM_PROTOCOLS))
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -107,12 +161,14 @@ define Package/ffmpeg/Default/description
  audio and video in numerous formats.
 endef
 
+
 define Package/ffmpeg
 $(call Package/ffmpeg/Default)
  SECTION:=multimedia
  CATEGORY:=Multimedia
  TITLE+= program
- DEPENDS+= +libpthread +libffmpeg +libpostproc
+ DEPENDS+= +libpthread +libffmpeg
+ VARIANT:=full
 endef
 
 define Package/ffmpeg/description
@@ -121,12 +177,30 @@ $(call Package/ffmpeg/Default/description)
  This package contains the FFmpeg command line tool.
 endef
 
+
+define Package/ffprobe
+$(call Package/ffmpeg/Default)
+ SECTION:=multimedia
+ CATEGORY:=Multimedia
+ TITLE+= CLI media identifier
+ DEPENDS+= +libffmpeg
+ VARIANT:=full
+endef
+
+define Package/ffprobe/description
+$(call Package/ffmpeg/Default/description)
+ .
+ This package contains the FFprobe command line tool.
+endef
+
+
 define Package/ffserver
 $(call Package/ffserver/Default)
  SECTION:=multimedia
  CATEGORY:=Multimedia
  TITLE+= streaming server
- DEPENDS+= +libpthread +libffmpeg +@FFMPEG_FFSERVER_SUPPORT
+ DEPENDS+= +libpthread +libffmpeg
+ VARIANT:=full
 endef
 
 define Package/ffserver/description
@@ -135,94 +209,146 @@ $(call Package/ffmpeg/Default/description)
  This package contains the FFmpeg streaming server.
 endef
 
-define Package/libffmpeg
+
+define Package/libffmpeg/Default
 $(call Package/ffmpeg/Default)
  SECTION:=libs
  CATEGORY:=Libraries
  TITLE+= libraries
  DEPENDS+= +libpthread +zlib
+ PROVIDES:= libffmpeg
+endef
+
+
+define Package/libffmpeg-custom
+$(call Package/libffmpeg/Default)
+ TITLE+= (mini)
+ DEPENDS+= @DEVEL
+ VARIANT:=custom
  MENU:=1
 endef
 
-define Package/libffmpeg/config
+define Package/libffmpeg-custom/config
 source "$(SOURCE)/Config.in"
 endef
 
-define Package/libffmeg/description
+define Package/libffmpeg-custom/description
 $(call Package/ffmpeg/Default/description)
  .
- This package contains FFmpeg shared libraries.
+ This package contains customized FFmpeg shared libraries.
 endef
 
-define Package/libpostproc
- SECTION:=libs
- CATEGORY:=Libraries
- TITLE:=libpostproc
- URL:=http://ffmpeg.mplayerhq.hu/
- DEPENDS:=+libffmpeg
+
+define Package/libffmpeg-full
+$(call Package/libffmpeg/Default)
+ TITLE+= (full)
+ DEPENDS+= @BUILD_PATENTED +alsa-lib
+ VARIANT:=full
+endef
+
+define Package/libffmpeg-full/description
+$(call Package/ffmpeg/Default/description)
+ .
+ This package contains full-featured FFmpeg shared libraries.
 endef
 
-FILTER_CONFIG= \
-	$(foreach c, $(3), \
-		$(if $(CONFIG_FFMPEG_$(1)_$(c)),--enable-$(2)="$(c)") \
+
+define Package/libffmpeg-mini
+$(call Package/libffmpeg/Default)
+ TITLE+= (mini)
+ DEPENDS+= @BUILD_PATENTED
+ VARIANT:=mini
+endef
+
+define Package/libffmpeg-mini/description
+$(call Package/ffmpeg/Default/description)
+ .
+ This package contains minimal-featured FFmpeg shared libraries.
+endef
+
+
+FFMPEG_CONFIGURE:= \
+	CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(FPIC)" \
+	LDFLAGS="$(TARGET_LDFLAGS)" \
+	./configure \
+	--enable-cross-compile \
+	--cross-prefix="$(TARGET_CROSS)" \
+	--arch="$(ARCH)" \
+	--target-os=linux \
+	--prefix="/usr" \
+	--enable-shared \
+	--enable-static \
+	--disable-debug \
+	--pkg-config="pkg-config" \
+	\
+	--enable-gpl \
+	--enable-version3 \
+	\
+	--disable-asm \
+	--disable-doc \
+	--disable-dxva2 \
+	--enable-pthreads \
+	--disable-optimizations \
+	--enable-small \
+	--disable-stripping \
+	--enable-zlib \
+
+ifeq ($(BUILD_VARIANT),custom)
+
+  FFMPEG_ENABLE= \
+	$(foreach c, $(2), \
+		$(if $($(3)_$(c)),--enable-$(1)="$(c)") \
 	)
 
-FFMPEG_CONFIGURE_ENCODERS:=$(call FILTER_CONFIG,ENCODER,encoder,$(FFMPEG_ENCODERS))
-FFMPEG_CONFIGURE_DECODERS:=$(call FILTER_CONFIG,DECODER,decoder,$(FFMPEG_DECODERS))
-FFMPEG_CONFIGURE_MUXERS:=$(call FILTER_CONFIG,MUXER,muxer,$(FFMPEG_MUXERS))
-FFMPEG_CONFIGURE_DEMUXERS:=$(call FILTER_CONFIG,DEMUXER,demuxer,$(FFMPEG_DEMUXERS))
-FFMPEG_CONFIGURE_PARSERS:=$(call FILTER_CONFIG,PARSER,parser,$(FFMPEG_PARSERS))
-FFMPEG_CONFIGURE_PROTOCOLS:=$(call FILTER_CONFIG,PROTOCOL,protocol,$(FFMPEG_PROTOCOLS))
+  FFMPEG_CONFIGURE+= \
+	--disable-ffmpeg \
+	--disable-ffplay \
+	--disable-ffprobe \
+	--disable-ffserver \
+	--disable-avfilter \
+	--disable-postproc \
+	--disable-swscale \
+	--disable-everything \
+	$(call FFMPEG_ENABLE,encoder,$(FFMPEG_CUSTOM_ENCODERS),CONFIG_FFMPEG_ENCODER) \
+	$(call FFMPEG_ENABLE,decoder,$(FFMPEG_CUSTOM_DECODERS),CONFIG_FFMPEG_DECODER) \
+	$(call FFMPEG_ENABLE,muxer,$(FFMPEG_CUSTOM_MUXERS),CONFIG_FFMPEG_MUXER) \
+	$(call FFMPEG_ENABLE,demuxer,$(FFMPEG_CUSTOM_DEMUXERS),CONFIG_FFMPEG_DEMUXER) \
+	$(call FFMPEG_ENABLE,parser,$(FFMPEG_CUSTOM_PARSERS),CONFIG_FFMPEG_PARSER) \
+	$(call FFMPEG_ENABLE,protocol,$(FFMPEG_CUSTOM_PROTOCOLS),CONFIG_FFMPEG_PROTOCOL) \
+
+endif
+
+ifeq ($(BUILD_VARIANT),mini)
+
+  FFMPEG_ENABLE= \
+	$(foreach c, $(2), \
+		--enable-$(1)="$(c)" \
+	)
 
-# XXX: add --disable-mmx & --disable-mmx2 to fix build failure on x86
-# libpostproc/postprocess_template.c:2195: error: can't find a register in class 'GENERAL_REGS' while reloading 'asm'
-# libpostproc/postprocess_template.c:3124: error: can't find a register in class 'GENERAL_REGS' while reloading 'asm'
-# libpostproc/postprocess_template.c:3207: error: can't find a register in class 'GENERAL_REGS' while reloading 'asm'
+  FFMPEG_CONFIGURE+= \
+	--disable-ffmpeg \
+	--disable-ffplay \
+	--disable-ffprobe \
+	--disable-ffserver \
+	--disable-avfilter \
+	--disable-postproc \
+	--disable-swscale \
+	--disable-everything \
+	$(call FFMPEG_ENABLE,encoder,$(FFMPEG_MINI_ENCODERS)) \
+	$(call FFMPEG_ENABLE,decoder,$(FFMPEG_MINI_DECODERS)) \
+	$(call FFMPEG_ENABLE,muxer,$(FFMPEG_MINI_MUXERS)) \
+	$(call FFMPEG_ENABLE,demuxer,$(FFMPEG_MINI_DEMUXERS)) \
+	$(call FFMPEG_ENABLE,parser,$(FFMPEG_MINI_PARSERS)) \
+	$(call FFMPEG_ENABLE,protocol,$(FFMPEG_MINI_PROTOCOLS)) \
+
+endif
+
+ifneq ($(CONFIG_TARGET_x86),)
+  TARGET_CFLAGS += -fomit-frame-pointer
+endif
 
 define Build/Configure
-	# this is *NOT* GNU configure
-	( cd $(PKG_BUILD_DIR); \
-		CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(FPIC)" \
-		LDFLAGS="$(TARGET_LDFLAGS)" \
-		./configure \
-		--enable-cross-compile \
-		--cross-prefix="$(TARGET_CROSS)" \
-		--arch="$(ARCH)" \
-		--prefix="/usr" \
-		--enable-shared \
-		--enable-static \
-		--disable-debug \
-		--enable-gpl \
-		--disable-libfaad \
-		--disable-mmx \
-		--disable-mmx2 \
-		--enable-pthreads \
-		--disable-optimizations \
-		--enable-small \
-		--disable-stripping \
-		--disable-vhook \
-		--enable-zlib \
-		--enable-postproc \
-		\
-		$(if $(CONFIG_PACKAGE_ffmpeg),,--disable-ffmpeg) \
-		$(if $(CONFIG_PACKAGE_ffserver),,--disable-ffserver) \
-		$(if $(CONFIG_FFMPEG_IPV6),,--disable-ipv6) \
-		\
-		--disable-bsfs \
-		--disable-devices \
-		--disable-encoders \
-		$(FFMPEG_CONFIGURE_ENCODERS) \
-		--disable-decoders \
-		$(FFMPEG_CONFIGURE_DECODERS) \
-		--disable-muxers \
-		$(FFMPEG_CONFIGURE_MUXERS) \
-		--disable-demuxers \
-		$(FFMPEG_CONFIGURE_DEMUXERS) \
-		--disable-parsers \
-		$(FFMPEG_CONFIGURE_PARSERS) \
-		--disable-protocols \
-		$(FFMPEG_CONFIGURE_PROTOCOLS) \
-	)
+	( cd $(PKG_BUILD_DIR); $(FFMPEG_CONFIGURE) )
 endef
 
 define Build/Compile
@@ -231,39 +357,74 @@ define Build/Compile
 		all install
 endef
 
-define Build/InstallDev
+define Build/InstallDev/custom
 	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/libav{codec,device,format,util} $(1)/usr/include/
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/libpostproc $(1)/usr/include/
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/lib{avcodec,avdevice,avformat,avutil} $(1)/usr/include/
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libav{codec,device,format,util}.{a,so*} $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libpostproc.{a,so*} $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{avcodec,avdevice,avformat,avutil}.{a,so*} $(1)/usr/lib/
 	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libav{codec,device,format,util}.pc $(1)/usr/lib/pkgconfig/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libpostproc.pc $(1)/usr/lib/pkgconfig/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/lib{avcodec,avdevice,avformat,avutil}.pc $(1)/usr/lib/pkgconfig/
 endef
 
+define Build/InstallDev/full
+	$(INSTALL_DIR) $(1)/usr/include
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/lib{avcodec,avdevice,avfilter,avformat,avutil,postproc,swscale} $(1)/usr/include/
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{avcodec,avdevice,avfilter,avformat,avutil,postproc,swscale}.{a,so*} $(1)/usr/lib/
+	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/lib{avcodec,avdevice,avfilter,avformat,avutil,postproc,swscale}.pc $(1)/usr/lib/pkgconfig/
+endef
+
+Build/InstallDev/mini = $(Build/InstallDev/custom)
+
+# XXX: attempt at installing "best" dev files available
+ifeq ($(BUILD_VARIANT),custom)
+  # XXX: only install "custom" dev files if -full & -mini are not selected
+  ifeq ($(CONFIG_PACKAGE_libffmpeg-full)$(CONFIG_PACKAGE_libffmpeg-mini),)
+    Build/InstallDev = $(Build/InstallDev/custom)
+  endif
+endif
+ifeq ($(BUILD_VARIANT),full)
+  # XXX: always install "full" dev files if -full is selected
+  Build/InstallDev = $(Build/InstallDev/full)
+endif
+ifeq ($(BUILD_VARIANT),mini)
+  # XXX: only install "mini" dev files if -full is not selected
+  ifeq ($(CONFIG_PACKAGE_libffmpeg-full),)
+    Build/InstallDev = $(Build/InstallDev/mini)
+  endif
+endif
+
 define Package/ffmpeg/install
 	$(INSTALL_DIR) $(1)/usr/bin
 	$(CP) $(PKG_INSTALL_DIR)/usr/bin/ffmpeg $(1)/usr/bin/
 endef
 
+define Package/ffprobe/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(CP) $(PKG_INSTALL_DIR)/usr/bin/ffprobe $(1)/usr/bin/
+endef
+
 define Package/ffserver/install
 	$(INSTALL_DIR) $(1)/usr/bin
 	$(CP) $(PKG_INSTALL_DIR)/usr/bin/ffserver $(1)/usr/bin/
 endef
 
-define Package/libffmpeg/install
+define Package/libffmpeg-custom/install
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libav{codec,device,format,util}.so.* $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{avcodec,avdevice,avformat,avutil}.so.* $(1)/usr/lib/
 endef
 
-define Package/libpostproc/install
+define Package/libffmpeg-full/install
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libpostproc.so.* $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{avcodec,avdevice,avfilter,avformat,avutil,postproc,swscale}.so.* $(1)/usr/lib/
 endef
 
+Package/libffmpeg-mini/install = $(Package/libffmpeg-custom/install)
+
 $(eval $(call BuildPackage,ffmpeg))
+$(eval $(call BuildPackage,ffprobe))
 $(eval $(call BuildPackage,ffserver))
-$(eval $(call BuildPackage,libffmpeg))
-$(eval $(call BuildPackage,libpostproc))
+$(eval $(call BuildPackage,libffmpeg-custom))
+$(eval $(call BuildPackage,libffmpeg-full))
+$(eval $(call BuildPackage,libffmpeg-mini))