Contribs: fix vpx threading on Win32

diff --git a/contrib/src/vpx/libvpx-win32.patch b/contrib/src/vpx/libvpx-win32.patch
new file mode 100644 (file)
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 b8f07460cafbbe33de3349fd8ba25ecca5841700..df8c3140bda64543148f55b4bf92dfc85123cb9a 100644 (file)
--- 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 \