From c09f96ba2dd75012c2fff6d79243e1e67f523a8c Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Wed, 12 Aug 2015 20:13:14 +0000
Subject: [PATCH] x264: bump version to 20150725.

---
 .../x264/patches/x264-20140308.patchset       | 23 ---------
 .../x264/patches/x264-20150725.patchset       | 47 +++++++++++++++++++
 ...4-20140308.recipe => x264-20150725.recipe} |  6 +--
 3 files changed, 50 insertions(+), 26 deletions(-)
 delete mode 100644 media-libs/x264/patches/x264-20140308.patchset
 create mode 100644 media-libs/x264/patches/x264-20150725.patchset
 rename media-libs/x264/{x264-20140308.recipe => x264-20150725.recipe} (89%)

diff --git a/media-libs/x264/patches/x264-20140308.patchset b/media-libs/x264/patches/x264-20140308.patchset
deleted file mode 100644
index 1acbed1f1..000000000
--- a/media-libs/x264/patches/x264-20140308.patchset
+++ /dev/null
@@ -1,23 +0,0 @@
-From a31af43d0e8d602e467570de30b816b01f30bd40 Mon Sep 17 00:00:00 2001
-From: Jerome Duval <jerome.duval@gmail.com>
-Date: Fri, 13 Jun 2014 19:56:27 +0000
-Subject: Haiku patch
-
-
-diff --git a/configure b/configure
-index 0177cfc..d1a118f 100755
---- a/configure
-+++ b/configure
-@@ -550,6 +550,9 @@ case $host_os in
-         HAVE_GETOPT_LONG=0
-         CFLAGS="$CFLAGS -I\$(SRCPATH)/extras"
-         ;;
-+    *haiku*)
-+        SYS="haiku"
-+        ;;
-     *)
-         die "Unknown system $host, edit the configure"
-         ;;
--- 
-1.8.3.4
-
diff --git a/media-libs/x264/patches/x264-20150725.patchset b/media-libs/x264/patches/x264-20150725.patchset
new file mode 100644
index 000000000..cdb36ca93
--- /dev/null
+++ b/media-libs/x264/patches/x264-20150725.patchset
@@ -0,0 +1,47 @@
+From 15849a53c78b5b0d8d10e439ae6d383d62b61e3b Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Fri, 13 Jun 2014 19:56:27 +0000
+Subject: Haiku patch
+
+
+diff --git a/configure b/configure
+index 15b1c91..181c64f 100755
+--- a/configure
++++ b/configure
+@@ -644,6 +644,9 @@ case $host_os in
+         HAVE_GETOPT_LONG=0
+         CFLAGS="$CFLAGS -I\$(SRCPATH)/extras"
+         ;;
++    *haiku*)
++        SYS="HAIKU"
++        ;;
+     *)
+         die "Unknown system $host, edit the configure"
+         ;;
+-- 
+1.8.3.4
+
+
+From 50cfef611e7b77ee30f9ec8f04d75a37e430923a Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Wed, 12 Aug 2015 19:46:55 +0000
+Subject: Add Haiku version of adjusting thread priority
+
+
+diff --git a/common/osdep.h b/common/osdep.h
+index 2dfd00b..d0819ac 100644
+--- a/common/osdep.h
++++ b/common/osdep.h
+@@ -363,6 +363,9 @@ static ALWAYS_INLINE void x264_prefetch( void *p )
+     sp.sched_priority -= p;\
+     pthread_setschedparam( handle, policy, &sp );\
+ }
++#elif SYS_HAIKU
++#include <OS.h>
++#define x264_lower_thread_priority(p) { UNUSED status_t nice_ret = set_thread_priority(find_thread(NULL), B_LOW_PRIORITY); }
+ #else
+ #include <unistd.h>
+ #define x264_lower_thread_priority(p) { UNUSED int nice_ret = nice(p); }
+-- 
+1.8.3.4
+
diff --git a/media-libs/x264/x264-20140308.recipe b/media-libs/x264/x264-20150725.recipe
similarity index 89%
rename from media-libs/x264/x264-20140308.recipe
rename to media-libs/x264/x264-20150725.recipe
index d242803d2..189448f67 100644
--- a/media-libs/x264/x264-20140308.recipe
+++ b/media-libs/x264/x264-20150725.recipe
@@ -4,9 +4,9 @@ HOMEPAGE="http://www.videolan.org/developers/x264.html"
 COPYRIGHT="2003-2012 VideoLan.org"
 LICENSE="GNU GPL v2"
 REVISION="1"
-SOURCE_URI="http://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20140308-2245.tar.bz2"
-SOURCE_DIR="x264-snapshot-20140308-2245"
-CHECKSUM_SHA256="b179cb1e1d4f51418d292011a7494d5b62145571c05c22007f28d8fd89d2ebbe"
+SOURCE_URI="http://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20150725-2245.tar.bz2"
+SOURCE_DIR="x264-snapshot-20150725-2245"
+CHECKSUM_SHA256="c10db04ae93ec4999dde135bafcdbd05fc40ef3187804498734115e521288e0c"
 PATCHES="x264-$portVersion.patchset"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"