[vlc-commits] Contribs: fix vpx threading on Win32

[Jean-Baptiste Kempf]

vlc/vlc-2.0 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu Mar 14 15:43:20 2013 +0100| [04c92ff562b7ab97749e5c38557cbcdb71a069fb] | committer: Jean-Baptiste Kempf

Contribs: fix vpx threading on Win32
(cherry picked from commit c51906de3a23ad6580c2c1373ef71d9c05f92993)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=04c92ff562b7ab97749e5c38557cbcdb71a069fb
---

 contrib/src/vpx/libvpx-win32.patch |   11 +++++++++++
 contrib/src/vpx/rules.mak          |    3 +++
 2 files changed, 14 insertions(+)

diff --git a/contrib/src/vpx/libvpx-win32.patch b/contrib/src/vpx/libvpx-win32.patch
new file mode 100644
index 0000000..fcf9862
--- /dev/null
+++ b/contrib/src/vpx/libvpx-win32.patch
@@ -0,0 +1,11 @@
+--- libvpx/vp8/common/generic/systemdependent.c	2013-03-14 15:39:20.284261976 +0100
++++ libvpx.new/vp8/common/generic/systemdependent.c	2013-03-14 15:39:01.423974364 +0100
+@@ -87,7 +87,7 @@
+ #endif
+ 
+ 
+-#if HAVE_PTHREAD_H
++#if HAVE_PTHREAD_H && !defined(_WIN32)
+ #include <pthread.h>
+ static void once(void (*func)(void))
+ {
diff --git a/contrib/src/vpx/rules.mak b/contrib/src/vpx/rules.mak
index b6b67e0..0e835a5 100644
--- a/contrib/src/vpx/rules.mak
+++ b/contrib/src/vpx/rules.mak
@@ -24,6 +24,9 @@ ifdef HAVE_MACOSX
 	$(APPLY) $(SRC)/vpx/libvpx-mac-mountain-lion.patch
 endif
 	$(PATCH_BASH_LOCATION)
+ifdef HAVE_WIN32
+	$(APPLY) $(SRC)/vpx/libvpx-win32.patch
+endif
 	$(MOVE)
 
 DEPS_vpx =