From 228c3d0dea5bfea04578b81d79f412d99dbdef6f Mon Sep 17 00:00:00 2001
From: Ian Leonard <antonlacon@gmail.com>
Date: Sat, 19 Jul 2014 06:10:33 -0700
Subject: [PATCH] ffmpeg: update to 2.3.1

Changes:
Disable SIMD usage; creates build errors
Disable runtime cpudetect as it's all disabled
Re-enable compiler optimizations
re-enable stripping

Signed-off-by: Ian Leonard <antonlacon@gmail.com>
---
 multimedia/ffmpeg/Makefile | 61 ++++++++++++++++++++++++--------------
 1 file changed, 38 insertions(+), 23 deletions(-)

diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 357e46b47..6ab79f524 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ffmpeg
-PKG_VERSION:=0.11.5
-PKG_RELEASE:=5
+PKG_VERSION:=2.3.1
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://ffmpeg.org/releases/
-PKG_MD5SUM:=ea25fc252c132141f12988ed5506bfe8
+PKG_MD5SUM:=bb02e99c39941d7f3dc56658b9324a2b
 PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
 
 PKG_LICENSE:=LGPL-2.1+ GPL-2+ LGPL-3
@@ -368,23 +368,47 @@ FFMPEG_CONFIGURE:= \
 	--arch="$(ARCH)" \
 	--target-os=linux \
 	--prefix="/usr" \
+	--pkg-config="pkg-config" \
 	--enable-shared \
 	--enable-static \
+	--enable-small \
+	--enable-pthreads \
+	--enable-zlib \
+	--disable-runtime-cpudetect \
+	--disable-doc \
 	--disable-debug \
-	--pkg-config="pkg-config" \
 	\
 	--enable-gpl \
 	--enable-version3 \
 	\
 	--disable-altivec \
-	--disable-asm \
-	--disable-doc \
+	--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-vfp \
+	--disable-neon \
+	--disable-inline-asm \
+	--disable-yasm \
+	--disable-mipsdspr1 \
+	--disable-mipsdspr2 \
+	--disable-mipsfpu \
+	\
 	--disable-dxva2 \
-	--enable-pthreads \
-	--disable-optimizations \
-	--enable-small \
-	--disable-stripping \
-	--enable-zlib \
+	--disable-vaapi \
+	--disable-vda \
+	--disable-vdpau \
 	--disable-outdevs
 
 ifeq ($(BUILD_VARIANT),custom)
@@ -395,10 +419,7 @@ ifeq ($(BUILD_VARIANT),custom)
 	)
 
   FFMPEG_CONFIGURE+= \
-	--disable-ffmpeg \
-	--disable-ffplay \
-	--disable-ffprobe \
-	--disable-ffserver \
+	--disable-programs \
 	--disable-avfilter \
 	--disable-postproc \
 	--disable-swresample \
@@ -435,10 +456,7 @@ ifeq ($(BUILD_VARIANT),audio-dec)
 	)
 
   FFMPEG_CONFIGURE+= \
-	--disable-ffmpeg \
-	--disable-ffplay \
-	--disable-ffprobe \
-	--disable-ffserver \
+	--disable-programs \
 	--disable-avfilter \
 	--disable-postproc \
 	--disable-swresample \
@@ -461,10 +479,7 @@ ifeq ($(BUILD_VARIANT),mini)
 	)
 
   FFMPEG_CONFIGURE+= \
-	--disable-ffmpeg \
-	--disable-ffplay \
-	--disable-ffprobe \
-	--disable-ffserver \
+	--disable-programs \
 	--disable-avdevice \
 	--disable-avfilter \
 	--disable-postproc \