Contribs: fix vpx threading on Win32

c51906de · Jean-Baptiste Kempf · e4ef96c2 · c51906de · c51906de
Commit c51906de authored Mar 14, 2013 by Jean-Baptiste Kempf
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 0 deletions

contrib/src/vpx/libvpx-win32.patch contrib/src/vpx/libvpx-win32.patch +11 -0

contrib/src/vpx/rules.mak contrib/src/vpx/rules.mak +3 -0

No files found.
--- a/contrib/src/vpx/libvpx-win32.patch
+++ b/contrib/src/vpx/libvpx-win32.patch
+--- 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))
+ {
--- 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 \