From c2fa28243135e6f38b2a866f0390766a0af9d861 Mon Sep 17 00:00:00 2001
From: Ian Leonard <antonlacon@gmail.com>
Date: Mon, 7 Aug 2017 23:54:09 -0700
Subject: [PATCH] ffmpeg: update to 3.2.7

Removes the x86 optimization disables from the SOFT_FLOAT portion. There are no i386 profiles that do
not use hard float, so these options accomplish nothing.

Target-os=linux rules out dxva2 and vda, so disable statements are unnecessary.

For x86-64 users of libffmpeg-full, optimize around performance instead of size.

Remove patented flag requirement from mp2 and mp3 audio files in libffmpeg-custom per expiration.

Tidies up some of the configure steps where only one option is being changed or cosmetic consistency.

Signed-off-by: Ian Leonard <antonlacon@gmail.com>
---
 multimedia/ffmpeg/Config.in |  5 +---
 multimedia/ffmpeg/Makefile  | 53 ++++++++++++-------------------------
 2 files changed, 18 insertions(+), 40 deletions(-)

diff --git a/multimedia/ffmpeg/Config.in b/multimedia/ffmpeg/Config.in
index cd0d5f885..f1029a6c8 100644
--- a/multimedia/ffmpeg/Config.in
+++ b/multimedia/ffmpeg/Config.in
@@ -141,7 +141,6 @@ config FFMPEG_CUSTOM_SELECT_libfdk-aac
 
 config FFMPEG_CUSTOM_SELECT_libmp3lame
 	bool "Libmp3lame"
-	depends on FFMPEG_CUSTOM_PATENTED
 	depends on PACKAGE_lame-lib
 	select FFMPEG_CUSTOM_DECODER_mp3
 	select FFMPEG_CUSTOM_MUXER_mp3
@@ -253,11 +252,9 @@ config FFMPEG_CUSTOM_DECODER_jpegls
 
 config FFMPEG_CUSTOM_DECODER_mp2
 	bool "MP2 (MPEG Audio Layer 2)"
-	depends on FFMPEG_CUSTOM_PATENTED
 
 config FFMPEG_CUSTOM_DECODER_mp3
-	bool "MP3 (MPEG Audio Layer 2)"
-	depends on FFMPEG_CUSTOM_PATENTED
+	bool "MP3 (MPEG Audio Layer 3)"
 
 config FFMPEG_CUSTOM_DECODER_mpegvideo
 	bool "MPEG Video"
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index f7a8ebbaf..b875b54ff 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -9,13 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ffmpeg
-PKG_VERSION:=3.2.6
-PKG_RELEASE:=2
+PKG_VERSION:=3.2.7
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://ffmpeg.org/releases/
-PKG_MD5SUM:=7a35bd97bd7253305bf5c0af5f9dd3ce
-PKG_HASH:=3751cebb5c71a861288267769114d12b966a7703a686a325d90a93707f3a6d9f
+PKG_HASH:=28e75fc32485a88035a7ebf0a956a1e5c7e93b440dd4bbd6bc30c7268cf34fe9
 PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>, \
 		Ian Leonard <antonlacon@gmail.com>
 
@@ -150,7 +149,7 @@ FFMPEG_MINI_DEMUXERS:= \
 	ogg \
 
 FFMPEG_MINI_PROTOCOLS:= \
-	file \
+	file
 
 FFMPEG_AUDIO_DECODERS:= \
 	aac \
@@ -380,34 +379,16 @@ FFMPEG_CONFIGURE:= \
 	--disable-doc \
 	--disable-debug \
 	\
-	--disable-dxva2 \
 	--disable-lzma \
 	--disable-vaapi \
-	--disable-vda \
 	--disable-vdpau \
 	--disable-outdevs
 
 ifeq ($(CONFIG_SOFT_FLOAT),y)
-FFMPEG_CONFIGURE += \
+FFMPEG_CONFIGURE+= \
 	--disable-altivec \
 	--disable-vsx \
 	--disable-power8 \
-	--disable-amd3dnow \
-	--disable-amd3dnowext \
-	--disable-mmx \
-	--disable-mmxext \
-	--disable-sse \
-	--disable-sse2 \
-	--disable-sse3 \
-	--disable-ssse3 \
-	--disable-sse4 \
-	--disable-sse42 \
-	--disable-avx \
-	--disable-xop \
-	--disable-fma3 \
-	--disable-fma4 \
-	--disable-avx2 \
-	--disable-aesni \
 	--disable-armv5te \
 	--disable-armv6 \
 	--disable-armv6t2 \
@@ -421,37 +402,33 @@ FFMPEG_CONFIGURE += \
 	--disable-runtime-cpudetect
 
 else ifneq ($(findstring arm,$(CONFIG_ARCH)),)
-FFMPEG_CONFIGURE += \
+FFMPEG_CONFIGURE+= \
 	--disable-runtime-cpudetect
 # XXX: GitHub issue 3320 ppc cpu with fpu but no altivec (WNDR4700)
 else ifneq ($(findstring powerpc,$(CONFIG_ARCH)),)
-FFMPEG_CONFIGURE += \
+FFMPEG_CONFIGURE+= \
 	--disable-altivec
 endif
 
 # selectively disable optimizations according to arch/cpu type
 ifneq ($(findstring arm,$(CONFIG_ARCH)),)
 	ifneq ($(findstring vfp,$(CONFIG_TARGET_OPTIMIZATION)),)
-		FFMPEG_CONFIGURE+= \
-			--enable-vfp
+		FFMPEG_CONFIGURE+= --enable-vfp
 	else
-		FFMPEG_CONFIGURE+= \
-			--disable-vfp
+		FFMPEG_CONFIGURE+= --disable-vfp
 	endif
 	ifneq ($(findstring neon,$(CONFIG_TARGET_OPTIMIZATION)),)
 		FFMPEG_CONFIGURE+= \
 			--enable-neon \
 			--enable-vfp
 	else
-		FFMPEG_CONFIGURE+= \
-			--disable-neon
+		FFMPEG_CONFIGURE+= --disable-neon
 	endif
 
 endif
 
 ifneq ($(CONFIG_YASM),y)
-FFMPEG_CONFIGURE += \
-	--disable-yasm
+FFMPEG_CONFIGURE+= --disable-yasm
 
 endif
 
@@ -465,8 +442,12 @@ ifeq ($(BUILD_VARIANT),full)
 		\
 		$(if $(CONFIG_PACKAGE_shine),--enable-libshine)
   else
+	ifeq ($(ARCH),x86_64)
+		FFMPEG_CONFIGURE+= --enable-hardcoded-tables
+	else
+		FFMPEG_CONFIGURE+= --enable-small
+	endif
 	FFMPEG_CONFIGURE+= \
-		--enable-small \
 		--enable-gpl \
 		\
 		$(if $(CONFIG_PACKAGE_lame-lib),--enable-libmp3lame) \
@@ -597,7 +578,7 @@ ifeq ($(BUILD_VARIANT),mini)
 endif
 
 ifneq ($(CONFIG_TARGET_x86),)
-  TARGET_CFLAGS += -fomit-frame-pointer
+  TARGET_CFLAGS+= -fomit-frame-pointer
 endif
 
 define Build/Configure