From 12422e2639447a5d2b18b7005d811fbf2a5a544d Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@users.noreply.github.com>
Date: Fri, 19 Aug 2016 21:50:14 +0000
Subject: [PATCH] ffmpeg: bump to 3.1.2. (#759)

---
 .../ffmpeg/{ffmpeg-3.1.1.recipe => ffmpeg-3.1.2.recipe}     | 6 +++---
 .../{ffmpeg-3.1.1.patchset => ffmpeg-3.1.2.patchset}        | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename media-video/ffmpeg/{ffmpeg-3.1.1.recipe => ffmpeg-3.1.2.recipe} (98%)
 rename media-video/ffmpeg/patches/{ffmpeg-3.1.1.patchset => ffmpeg-3.1.2.patchset} (84%)

diff --git a/media-video/ffmpeg/ffmpeg-3.1.1.recipe b/media-video/ffmpeg/ffmpeg-3.1.2.recipe
similarity index 98%
rename from media-video/ffmpeg/ffmpeg-3.1.1.recipe
rename to media-video/ffmpeg/ffmpeg-3.1.2.recipe
index 0a4166520..d4642af5e 100644
--- a/media-video/ffmpeg/ffmpeg-3.1.1.recipe
+++ b/media-video/ffmpeg/ffmpeg-3.1.2.recipe
@@ -7,9 +7,9 @@ COPYRIGHT="2000-2003 Fabrice Bellard
 	2003-2016 the FFmpeg developers"
 LICENSE="GNU LGPL v2.1
 	GNU GPL v2"
-REVISION="2"
+REVISION="1"
 SOURCE_URI="https://ffmpeg.org/releases/ffmpeg-$portVersion.tar.bz2"
-CHECKSUM_SHA256="a5bca50a90a37b983eaa17c483a387189175f37ca678ae7e51d43e7610b4b3b4"
+CHECKSUM_SHA256="62eb8d810b93c1ffc23739c0824a91eabfe5e7be81fab34ce740736a110b70f7"
 PATCHES="ffmpeg-$portVersion.patchset"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
@@ -71,6 +71,7 @@ CONFLICTS_devel="
 	"
 
 BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
 	devel:libbz2$secondaryArchSuffix
 	devel:libmodplug$secondaryArchSuffix
 	devel:libogg$secondaryArchSuffix
@@ -81,7 +82,6 @@ BUILD_REQUIRES="
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
 	cmd:gcc$secondaryArchSuffix >= 5
 	cmd:ld$secondaryArchSuffix
 	cmd:awk
diff --git a/media-video/ffmpeg/patches/ffmpeg-3.1.1.patchset b/media-video/ffmpeg/patches/ffmpeg-3.1.2.patchset
similarity index 84%
rename from media-video/ffmpeg/patches/ffmpeg-3.1.1.patchset
rename to media-video/ffmpeg/patches/ffmpeg-3.1.2.patchset
index ebcef0f76..8ca861061 100644
--- a/media-video/ffmpeg/patches/ffmpeg-3.1.1.patchset
+++ b/media-video/ffmpeg/patches/ffmpeg-3.1.2.patchset
@@ -5,10 +5,10 @@ Subject: disable ebx on x86.
 
 
 diff --git a/configure b/configure
-index 3760641..5b7b0bb 100755
+index adb4c27..bb5619d 100755
 --- a/configure
 +++ b/configure
-@@ -6242,6 +6242,7 @@ enabled threads && ! enabled pthreads && ! enabled atomics_native && die "non pt
+@@ -6238,6 +6238,7 @@ enabled threads && ! enabled pthreads && ! enabled atomics_native && die "non pt
  if test $target_os = "haiku"; then
      disable memalign
      disable posix_memalign