From 0984e8c03d25c89ad304c1055785694ab97783c0 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 9 Apr 2016 20:08:46 +0000
Subject: [PATCH] ffmpeg: bump version.

* fix gcc5 build on x86.
---
 ...{ffmpeg-3.0.recipe => ffmpeg-3.0.1.recipe} |  9 ++------
 media-video/ffmpeg/ffmpeg2-2.8.6.recipe       |  1 +
 .../ffmpeg/patches/ffmpeg-2.8.6.patchset      | 21 +++++++++++++++++++
 .../ffmpeg/patches/ffmpeg-3.0.1.patchset      | 21 +++++++++++++++++++
 4 files changed, 45 insertions(+), 7 deletions(-)
 rename media-video/ffmpeg/{ffmpeg-3.0.recipe => ffmpeg-3.0.1.recipe} (96%)
 create mode 100644 media-video/ffmpeg/patches/ffmpeg-2.8.6.patchset
 create mode 100644 media-video/ffmpeg/patches/ffmpeg-3.0.1.patchset

diff --git a/media-video/ffmpeg/ffmpeg-3.0.recipe b/media-video/ffmpeg/ffmpeg-3.0.1.recipe
similarity index 96%
rename from media-video/ffmpeg/ffmpeg-3.0.recipe
rename to media-video/ffmpeg/ffmpeg-3.0.1.recipe
index ec6856af7..0c7d3c459 100644
--- a/media-video/ffmpeg/ffmpeg-3.0.recipe
+++ b/media-video/ffmpeg/ffmpeg-3.0.1.recipe
@@ -8,10 +8,11 @@ LICENSE="GNU LGPL v2.1
 COPYRIGHT="2000-2003 Fabrice Bellard
 	2003-2016 the FFmpeg developers"
 SOURCE_URI="http://ffmpeg.org/releases/ffmpeg-$portVersion.tar.xz"
-CHECKSUM_SHA256="12f32cee41c74435f608c30793fd616bdf53467bb513278e273e135a4c58e470"
+CHECKSUM_SHA256="c389ca5e3c29e758dd82ee6981130fe79e73b06e26db1a3aa971daea63598bc1"
 REVISION="1"
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
+PATCHES="ffmpeg-$portVersion.patchset"
 
 PROVIDES="
 	ffmpeg$secondaryArchSuffix = $portVersion compat >= 3.0
@@ -129,12 +130,6 @@ BUILD()
 		--enable-gpl \
 		--enable-avresample
 
-	if [ $targetArchitecture = x86_64 ]; then
-		cflags="-fPIC -std=c99"
-	else
-		cflags="-fno-PIC -std=c99"
-	fi
-
 	make $jobArgs CFLAGS="$cflags"
 }
 
diff --git a/media-video/ffmpeg/ffmpeg2-2.8.6.recipe b/media-video/ffmpeg/ffmpeg2-2.8.6.recipe
index f72dc3081..0bdf1d794 100644
--- a/media-video/ffmpeg/ffmpeg2-2.8.6.recipe
+++ b/media-video/ffmpeg/ffmpeg2-2.8.6.recipe
@@ -13,6 +13,7 @@ SOURCE_DIR="ffmpeg-$portVersion"
 REVISION="1"
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
+PATCHES="ffmpeg-$portVersion.patchset"
 
 PROVIDES="
 	ffmpeg2$secondaryArchSuffix = $portVersion compat >= 2.8
diff --git a/media-video/ffmpeg/patches/ffmpeg-2.8.6.patchset b/media-video/ffmpeg/patches/ffmpeg-2.8.6.patchset
new file mode 100644
index 000000000..05dc29cae
--- /dev/null
+++ b/media-video/ffmpeg/patches/ffmpeg-2.8.6.patchset
@@ -0,0 +1,21 @@
+From 88bf339b083a0945ddb56ca5b78708bbc1141fa6 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Sat, 9 Apr 2016 17:37:09 +0000
+Subject: disable ebx on x86.
+
+
+diff --git a/configure b/configure
+index 475c087..5a95b97 100755
+--- a/configure
++++ b/configure
+@@ -6052,6 +6052,7 @@ enabled threads && ! enabled pthreads && ! enabled atomics_native && die "non pt
+ if test $target_os = "haiku"; then
+     disable memalign
+     disable posix_memalign
++    enabled x86_32 && enabled shared && disable ebx_available
+ fi
+ 
+ enabled_all dxva2 dxva2api_cobj CoTaskMemFree &&
+-- 
+2.7.0
+
diff --git a/media-video/ffmpeg/patches/ffmpeg-3.0.1.patchset b/media-video/ffmpeg/patches/ffmpeg-3.0.1.patchset
new file mode 100644
index 000000000..05dc29cae
--- /dev/null
+++ b/media-video/ffmpeg/patches/ffmpeg-3.0.1.patchset
@@ -0,0 +1,21 @@
+From 88bf339b083a0945ddb56ca5b78708bbc1141fa6 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Sat, 9 Apr 2016 17:37:09 +0000
+Subject: disable ebx on x86.
+
+
+diff --git a/configure b/configure
+index 475c087..5a95b97 100755
+--- a/configure
++++ b/configure
+@@ -6052,6 +6052,7 @@ enabled threads && ! enabled pthreads && ! enabled atomics_native && die "non pt
+ if test $target_os = "haiku"; then
+     disable memalign
+     disable posix_memalign
++    enabled x86_32 && enabled shared && disable ebx_available
+ fi
+ 
+ enabled_all dxva2 dxva2api_cobj CoTaskMemFree &&
+-- 
+2.7.0
+