ffmpeg: Upgrade to 3.2.2. Remove Speex support

Signed-off-by: Ted Hess <thess@kitschensync.net>

diff --git a/multimedia/ffmpeg/Config.in b/multimedia/ffmpeg/Config.in
index a488908227f9d1ff359ba03f8aea3ee83a25e139..d2ab7d1f0d5b5bf9be2a90667b8c9c4b3a31b2eb 100644 (file)
--- a/multimedia/ffmpeg/Config.in
+++ b/multimedia/ffmpeg/Config.in
@@ -63,7 +63,6 @@ config FFMPEG_CUSTOM_AUDIO_DEC_SUPPORT
        select FFMPEG_CUSTOM_DECODER_opus
        select FFMPEG_CUSTOM_DECODER_pcm_s16be
        select FFMPEG_CUSTOM_DECODER_pcm_s16le
-       select FFMPEG_CUSTOM_SELECT_speex
        select FFMPEG_CUSTOM_DECODER_vorbis
        select FFMPEG_CUSTOM_DECODER_wavpack
        select FFMPEG_CUSTOM_DECODER_wmav1
@@ -117,9 +116,6 @@ config FFMPEG_CUSTOM_SELECT_mp3lame
 config FFMPEG_CUSTOM_SELECT_libopus
        bool "Opus"
 
-config FFMPEG_CUSTOM_SELECT_speex
-       bool "Speex"
-
 config FFMPEG_CUSTOM_SELECT_x264
        bool "x264"
        depends on FFMPEG_CUSTOM_PATENTED

diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index a982ea7600cd23c090ec0a68ce13fb9fda65f2e9..f87401444dc7ecbc4ff1bd51abf8093803253303 100644 (file)
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2016 OpenWrt.org
+# Copyright (C) 2006-2017 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,12 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ffmpeg
-PKG_VERSION:=2.8.8
-PKG_RELEASE:=2
+PKG_VERSION:=3.2.2
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=http://ffmpeg.org/releases/
-PKG_MD5SUM:=5fae1ba5a5d37a2d0de750479b7270d4
+PKG_SOURCE_URL:=https://ffmpeg.org/releases/
+PKG_MD5SUM:=e34d1b92c5d844f2a3611c741a6dba18
+PKG_HASH:=3f01bd1fe1a17a277f8c84869e5d9192b4b978cb660872aa2b54c3cc8a2fedfc
 PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
 
 PKG_LICENSE:=LGPL-2.1+ GPL-2+ LGPL-3
@@ -292,7 +293,7 @@ endef
 define Package/libffmpeg-custom
 $(call Package/libffmpeg/Default)
  TITLE+= (custom)
- DEPENDS+= +FFMPEG_CUSTOM_SELECT_libopus:libopus +FFMPEG_CUSTOM_SELECT_speex:libspeex \
+ DEPENDS+= +FFMPEG_CUSTOM_SELECT_libopus:libopus \
            +PACKAGE_libx264:libx264 +PACKAGE_lame-lib:lame-lib
 
  VARIANT:=custom
@@ -313,7 +314,6 @@ endef
 define Package/libffmpeg-audio-dec
 $(call Package/libffmpeg/Default)
  TITLE+= (audio)
- DEPENDS+= +libspeex
  VARIANT:=audio-dec
 endef
 
@@ -327,7 +327,7 @@ endef
 define Package/libffmpeg-full
 $(call Package/libffmpeg/Default)
  TITLE+= (full)
- DEPENDS+= +alsa-lib +PACKAGE_libx264:libx264 +PACKAGE_lame-lib:lame-lib +libopus +libspeex
+ DEPENDS+= +alsa-lib +PACKAGE_libx264:libx264 +PACKAGE_lame-lib:lame-lib +libopus
  VARIANT:=full
 endef
 
@@ -382,6 +382,8 @@ FFMPEG_CONFIGURE:= \
 ifeq ($(CONFIG_SOFT_FLOAT),y)
 FFMPEG_CONFIGURE += \
        --disable-altivec \
+       --disable-vsx \
+       --disable-power8 \
        --disable-amd3dnow \
        --disable-amd3dnowext \
        --disable-mmx \
@@ -397,11 +399,17 @@ FFMPEG_CONFIGURE += \
        --disable-fma3 \
        --disable-fma4 \
        --disable-avx2 \
+       --disable-aesni \
+       --disable-armv5te \
+       --disable-armv6 \
+       --disable-armv6t2 \
        --disable-inline-asm \
-       --disable-mips32r2 \
-       --disable-mipsdspr1 \
+       --disable-mipsdsp \
        --disable-mipsdspr2 \
        --disable-mipsfpu \
+       --disable-msa \
+       --disable-mmi \
+       --disable-fast-unaligned \
        --disable-runtime-cpudetect
 
 else ifneq ($(findstring arm,$(CONFIG_ARCH)),)
@@ -434,7 +442,6 @@ endif
 ifeq ($(BUILD_VARIANT),full)
        FFMPEG_CONFIGURE+= \
                --enable-libopus --enable-decoder=libopus \
-               --enable-libspeex --enable-decoder=libspeex \
                $(if $(CONFIG_PACKAGE_libx264),--enable-libx264) \
                $(if $(CONFIG_PACKAGE_lame-lib),--enable-libmp3lame)
 endif
@@ -473,11 +480,6 @@ ifeq ($(CONFIG_FFMPEG_CUSTOM_SELECT_libopus),y)
        --enable-libopus --enable-decoder=libopus
 endif
 
-ifeq ($(CONFIG_FFMPEG_CUSTOM_SELECT_speex),y)
-  FFMPEG_CONFIGURE+= \
-       --enable-libspeex --enable-decoder=libspeex
-endif
-
 ifeq ($(CONFIG_FFMPEG_CUSTOM_SELECT_x264),y)
   FFMPEG_CONFIGURE+= \
        --enable-libx264
@@ -508,7 +510,6 @@ ifeq ($(BUILD_VARIANT),audio-dec)
        $(call FFMPEG_ENABLE,demuxer,$(FFMPEG_AUDIO_DEMUXERS)) \
        $(call FFMPEG_ENABLE,parser,$(FFMPEG_AUDIO_PARSERS)) \
        $(call FFMPEG_ENABLE,protocol,$(FFMPEG_AUDIO_PROTOCOLS)) \
-       --enable-libspeex --enable-decoder=libspeex \
        --disable-decoder=pcm_bluray,pcm_dvd \
 
 endif