Changeset 28063


Ignore:
Timestamp:
2011-08-20T13:27:00+02:00 (6 years ago)
Author:
florian
Message:

[package] ffmpeg: 0.8.2 Version Bump (#8831)

FFmpeg 0.8.2 Version Bump (#8831)

Dropped configure options:
--disable-ipv6: IPv6 is no longer a separate switch. It's network aware or isn't.
--disable-libfaad: This switch isn't listed as part of ./configure --help.
--disable-vhook: vhook is no longer a part of ffmpeg.

Added configure options:
--disable-doc: Disables documentation
--disable-dxva2: Disables Microsoft's DirectX Video Acceleration v2
--enable-version3: Builds GPLv3 code
--disable-filters: Disables audio/video stream processing filters
--disable-hwaccels: Disables hardware video playback acceleration
--disable-ffplay: FFplay is a SDL(?) based media player.

Dropped formats:
oss is not listed in ./configure --list-muxers
mpeg4aac is not listed in ./configure --list-decoders

Configure options were reordered to roughly be:

Generic program configure switches
Libav* feature options
Binary selection

All of the libav* feature disabling was done at once. This is to keep from second guessing FFmpeg's internal dependency checking when we start enabling options.

Added options to keep from mass disabling encoders/muxers and decoders/demuxers. This should address #8831's issue.

Added option to build FFprobe. FFprobe is a command line media identification tool, very similar to the output of a bare ffmpeg -i.

Signed-off-by: Ian Leonard <antonlacon@…>

Location:
packages/multimedia/ffmpeg
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • packages/multimedia/ffmpeg/Config.in

    r26450 r28063  
    22        depends PACKAGE_libffmpeg 
    33 
    4 config FFMPEG_IPV6 
    5         bool "Enable IPv6" 
    6         default IPV6 
     4config FFMPEG_ENCODE 
     5        bool "Big Toggle for FFmpeg's encoder/muxer support" 
     6        depends FFMPEG_PATENTED 
     7 
     8config FFMPEG_DECODE 
     9        bool "Big Toggle for FFmpeg's decoder/demuxer support" 
     10        depends FFMPEG_PATENTED 
    711 
    812config FFMPEG_PATENTED 
    … …  
    2832        select FFMPEG_DECODER_mpeg2video 
    2933        select FFMPEG_DECODER_mpeg4 
    30         select FFMPEG_DECODER_mpeg4aac 
    3134        select FFMPEG_DECODER_mpegvideo 
    3235        select FFMPEG_DECODER_wmav1 
    … …  
    5053        select FFMPEG_DECODER_mpeg2video 
    5154        select FFMPEG_DECODER_mpeg4 
    52         select FFMPEG_DECODER_mpeg4aac 
    5355        select FFMPEG_DECODER_mpegvideo 
    5456        select FFMPEG_DECODER_wmav1 
    … …  
    154156        depends FFMPEG_PATENTED 
    155157 
    156 config FFMPEG_DECODER_mpeg4aac 
    157         bool "MPEG-4 (AAC)" 
    158         depends FFMPEG_PATENTED 
    159  
    160158config FFMPEG_DECODER_pcm_s16be 
    161159        bool "PCM signed 16-bit big-endian" 
    … …  
    212210config FFMPEG_MUXER_ogg 
    213211        bool "Ogg" 
    214  
    215 config FFMPEG_MUXER_oss 
    216         bool "OSS (Open Sound System playback)" 
    217212 
    218213config FFMPEG_MUXER_rtp 
    … …  
    323318 
    324319endmenu 
    325  

  • packages/multimedia/ffmpeg/Makefile

    r26449 r28063  
    99 
    1010PKG_NAME:=ffmpeg 
    11 PKG_VERSION:=0.5.4 
    12 PKG_RELEASE:=2 
     11PKG_VERSION:=0.8.2 
     12PKG_RELEASE:=1 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 
    1515PKG_SOURCE_URL:=http://ffmpeg.org/releases/ 
    16 PKG_MD5SUM:=87e771cd0f5d465fbf1a0a4824b7cc24 
     16PKG_MD5SUM:=967d481c98161582d149aced6e3b2f31 
    1717 
    1818FFMPEG_ENCODERS:= \ 
    … …  
    4141        mpeg2video \ 
    4242        mpeg4 \ 
    43         mpeg4aac \ 
    4443        mpegvideo \ 
    4544        pcm_s16be \ 
    … …  
    6160        mpegts \ 
    6261        ogg \ 
    63         oss \ 
    6462        rtp \ 
    6563 
    … …  
    128126endef 
    129127 
     128define Package/ffprobe 
     129$(call Package/ffmpeg/Default) 
     130 SECTION:=multimedia 
     131 CATEGORY:=Multimedia 
     132 TITLE+= CLI media identifier 
     133 DEPENDS+= +libffmpeg 
     134endef 
     135 
     136define Package/ffprobe/description 
     137$(call Package/ffmpeg/Default/description) 
     138 . 
     139 This package contains the FFprobe command line tool. 
     140endef 
     141 
    130142define Package/ffserver 
    131143$(call Package/ffserver/Default) 
    … …  
    155167endef 
    156168 
    157 define Package/libffmeg/description 
     169define Package/libffmpeg/description 
    158170$(call Package/ffmpeg/Default/description) 
    159171 . 
    … …  
    212224                --enable-static \ 
    213225                --disable-debug \ 
     226                \ 
    214227                --enable-gpl \ 
    215                 --disable-libfaad \ 
     228                --enable-version3 \ 
     229                \ 
     230                --disable-doc \ 
     231                --disable-dxva2 \ 
    216232                --disable-mmx \ 
    217233                --disable-mmx2 \ 
    … …  
    220236                --enable-small \ 
    221237                --disable-stripping \ 
    222                 --disable-vhook \ 
    223238                --enable-zlib \ 
    224239                --enable-postproc \ 
    225240                --enable-swscale \ 
    226241                \ 
    227                 $(if $(CONFIG_PACKAGE_ffmpeg),,--disable-ffmpeg) \ 
    228                 $(if $(CONFIG_PACKAGE_ffserver),,--disable-ffserver) \ 
    229                 $(if $(CONFIG_FFMPEG_IPV6),,--disable-ipv6) \ 
    230                 \ 
    231242                --disable-bsfs \ 
    232243                --disable-devices \ 
    233                 --disable-encoders \ 
     244                --disable-filters \ 
     245                --disable-hwaccels \ 
     246                --disable-parsers \ 
     247                --disable-protocols \ 
     248                $(if $(CONFIG_FFMPEG_ENCODE),,--disable-encoders --disable-muxers) \ 
     249                $(if $(CONFIG_FFMPEG_DECODE),,--disable-decoders --disable-demuxers) \ 
    234250                $(FFMPEG_CONFIGURE_ENCODERS) \ 
    235                 --disable-decoders \ 
    236251                $(FFMPEG_CONFIGURE_DECODERS) \ 
    237                 --disable-muxers \ 
    238252                $(FFMPEG_CONFIGURE_MUXERS) \ 
    239                 --disable-demuxers \ 
    240253                $(FFMPEG_CONFIGURE_DEMUXERS) \ 
    241                 --disable-parsers \ 
    242254                $(FFMPEG_CONFIGURE_PARSERS) \ 
    243                 --disable-protocols \ 
    244255                $(FFMPEG_CONFIGURE_PROTOCOLS) \ 
     256                \ 
     257                $(if $(CONFIG_PACKAGE_ffmpeg),,--disable-ffmpeg) \ 
     258                --disable-ffplay \ 
     259                $(if $(CONFIG_PACKAGE_ffprobe),,--disable-ffprobe) \ 
     260                $(if $(CONFIG_PACKAGE_ffserver),,--disable-ffserver) \ 
     261                \ 
    245262        ) 
    246263endef 
    … …  
    271288endef 
    272289 
     290define Package/ffprobe/install 
     291        $(INSTALL_DIR_ $(1)/usr/bin 
     292        $(CP) $(PKG_INSTALL_DIR)/usr/bin/ffprobe $(1)/usr/bin/ 
     293endef 
     294 
    273295define Package/ffserver/install 
    274296        $(INSTALL_DIR) $(1)/usr/bin 
    … …  
    292314 
    293315$(eval $(call BuildPackage,ffmpeg)) 
     316$(eval $(call BuildPackage,ffprobe)) 
    294317$(eval $(call BuildPackage,ffserver)) 
    295318$(eval $(call BuildPackage,libffmpeg)) 
Note: See TracChangeset for help on using the changeset viewer.