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

[Jean-Baptiste Kempf]

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

Contribs: fix vpx threading on Win32

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

 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 b8f0746..df8c314 100644
--- a/contrib/src/vpx/rules.mak
+++ b/contrib/src/vpx/rules.mak
@@ -17,6 +17,9 @@ ifdef HAVE_MACOSX
 	$(APPLY) $(SRC)/vpx/libvpx-mac.patch
 	$(APPLY) $(SRC)/vpx/libvpx-mac-mountain-lion.patch
 endif
+ifdef HAVE_WIN32
+	$(APPLY) $(SRC)/vpx/libvpx-win32.patch
+endif
 ifneq ($(which bash),/bin/bash)
 	sed -i.orig \
 		s,^\#!/bin/bash,\#!`which bash`,g \