[backfire/packages] openntpd: merge r28620, r28621

[openwrt/svn-archive/archive.git] / multimedia / ffmpeg / Makefile

diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 39c9e93bbd85f33b6e0599bd98882dfd63c9c3d2..e2dc1f13a3b5fe7df5b3e8e14a456d1ae9f42cea 100644 (file)
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2009 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,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ffmpeg
-PKG_VERSION:=20080419
+PKG_VERSION:=0.5.4
 PKG_RELEASE:=2
 
-PKG_SOURCE:=$(PKG_NAME)-export-snapshot-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://downloads.openwrt.org/sources/
-PKG_MD5SUM:=63aeb859941b96ed3ef7b0c7a643bf4d
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-export-2008-04-19
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=http://ffmpeg.org/releases/
+PKG_MD5SUM:=87e771cd0f5d465fbf1a0a4824b7cc24
 
 FFMPEG_ENCODERS:= \
        ac3 \
@@ -23,22 +21,31 @@ FFMPEG_ENCODERS:= \
        mpeg1video \
        mpeg2video \
        mpeg4 \
+       pcm_s16be \
+       pcm_s16le \
        png \
+       vorbis \
        zlib \
 
 FFMPEG_DECODERS:= \
+       aac \
        ac3 \
        atrac3 \
+       flac \
        gif \
        h264 \
        jpegls \
+       mp2 \
        mp3 \
        mpeg1video \
        mpeg2video \
        mpeg4 \
        mpeg4aac \
        mpegvideo \
+       pcm_s16be \
+       pcm_s16le \
        png \
+       vorbis \
        wmav1 \
        wmav2 \
        zlib \
@@ -52,26 +59,36 @@ FFMPEG_MUXERS:= \
        mpeg1video \
        mpeg2video \
        mpegts \
+       ogg \
+       oss \
        rtp \
 
 FFMPEG_DEMUXERS:= \
+       aac \
        ac3 \
+       avi \
+       flac \
        ffm \
        h264 \
+       matroska \
+       mov \
        mp3 \
        mpegps \
        mpegts \
        mpegvideo \
+       ogg \
+       rm \
        rtsp \
        sdp \
        v4l2 \
 
 FFMPEG_PARSERS:= \
+       aac \
        ac3 \
        h264 \
        mpegaudio \
-       mpegvideo \
        mpeg4video \
+       mpegvideo \
 
 FFMPEG_PROTOCOLS:= \
        file http pipe rtp tcp udp
@@ -101,7 +118,7 @@ $(call Package/ffmpeg/Default)
  SECTION:=multimedia
  CATEGORY:=Multimedia
  TITLE+= program
- DEPENDS+= +libpthread +libffmpeg
+ DEPENDS+= +libpthread +libffmpeg +libpostproc +libswscale
 endef
 
 define Package/ffmpeg/description
@@ -129,7 +146,7 @@ $(call Package/ffmpeg/Default)
  SECTION:=libs
  CATEGORY:=Libraries
  TITLE+= libraries
- DEPENDS+= +libpthread +libfaad2 +zlib
+ DEPENDS+= +libpthread +zlib
  MENU:=1
 endef
 
@@ -151,6 +168,14 @@ define Package/libpostproc
  DEPENDS:=+libffmpeg
 endef
 
+define Package/libswscale
+ SECTION:=libs
+ CATEGORY:=Libraries
+ TITLE:=libswscale
+ URL:=http://ffmpeg.mplayerhq.hu/
+ DEPENDS:=+libffmpeg
+endef
+
 FILTER_CONFIG= \
        $(foreach c, $(3), \
                $(if $(CONFIG_FFMPEG_$(1)_$(c)),--enable-$(2)="$(c)") \
@@ -163,6 +188,15 @@ FFMPEG_CONFIGURE_DEMUXERS:=$(call FILTER_CONFIG,DEMUXER,demuxer,$(FFMPEG_DEMUXER
 FFMPEG_CONFIGURE_PARSERS:=$(call FILTER_CONFIG,PARSER,parser,$(FFMPEG_PARSERS))
 FFMPEG_CONFIGURE_PROTOCOLS:=$(call FILTER_CONFIG,PROTOCOL,protocol,$(FFMPEG_PROTOCOLS))
 
+ifneq ($(CONFIG_TARGET_x86),)
+  TARGET_CFLAGS += -fomit-frame-pointer
+endif
+
+# 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'
+
 define Build/Configure
        # this is *NOT* GNU configure
        ( cd $(PKG_BUILD_DIR); \
@@ -172,14 +206,17 @@ define Build/Configure
                --enable-cross-compile \
                --cross-prefix="$(TARGET_CROSS)" \
                --arch="$(ARCH)" \
+               --target-os=linux \
                --prefix="/usr" \
                --enable-shared \
                --enable-static \
                --disable-debug \
-               --enable-ffmpeg \
-               --enable-ffserver \
                --enable-gpl \
-               --enable-libfaad \
+               --disable-libfaad \
+               --disable-amd3dnow \
+               --disable-amd3dnowext \
+               --disable-mmx \
+               --disable-mmx2 \
                --enable-pthreads \
                --disable-optimizations \
                --enable-small \
@@ -187,7 +224,14 @@ define Build/Configure
                --disable-vhook \
                --enable-zlib \
                --enable-postproc \
+               --enable-swscale \
                \
+               $(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 \
@@ -198,7 +242,6 @@ define Build/Configure
                $(FFMPEG_CONFIGURE_DEMUXERS) \
                --disable-parsers \
                $(FFMPEG_CONFIGURE_PARSERS) \
-               --disable-bsfs \
                --disable-protocols \
                $(FFMPEG_CONFIGURE_PROTOCOLS) \
        )
@@ -214,12 +257,15 @@ define Build/InstallDev
        $(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/libswscale $(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/libswscale.{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/libswscale.pc $(1)/usr/lib/pkgconfig/
 endef
 
 define Package/ffmpeg/install
@@ -242,7 +288,13 @@ define Package/libpostproc/install
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpostproc.so.* $(1)/usr/lib/
 endef
 
+define Package/libswscale/install
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libswscale.so.* $(1)/usr/lib/
+endef
+
 $(eval $(call BuildPackage,ffmpeg))
 $(eval $(call BuildPackage,ffserver))
 $(eval $(call BuildPackage,libffmpeg))
 $(eval $(call BuildPackage,libpostproc))
+$(eval $(call BuildPackage,libswscale))