[vlc-commits] Contribs: don't use pthread for Win32

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Nov  9 22:39:54 2011 +0100| [7fba4e1c87b7e39617ab07184f29a27b289eb748] | committer: Jean-Baptiste Kempf

Contribs: don't use pthread for Win32

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

 contrib/src/projectM/rules.mak   |    2 +-
 contrib/src/projectM/win32.patch |   26 ++++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletions(-)

diff --git a/contrib/src/projectM/rules.mak b/contrib/src/projectM/rules.mak
index 3447df9..8d679ee 100644
--- a/contrib/src/projectM/rules.mak
+++ b/contrib/src/projectM/rules.mak
@@ -27,7 +27,7 @@ endif
 
 DEPS_projectM = glew $(DEPS_glew)
 
-.projectM: projectM .glew .pthreads
+.projectM: projectM .glew
 	-cd $< && rm CMakeCache.txt
 	cd $< && $(HOSTVARS) $(CMAKE) \
 		-DINCLUDE-PROJECTM-LIBVISUAL:BOOL=OFF \
diff --git a/contrib/src/projectM/win32.patch b/contrib/src/projectM/win32.patch
index 88204b4..dfbf425 100644
--- a/contrib/src/projectM/win32.patch
+++ b/contrib/src/projectM/win32.patch
@@ -199,3 +199,29 @@ diff -ruN libprojectM/Renderer/TextureManager.cpp libprojectM.new/Renderer/Textu
  
  TextureManager::TextureManager(const std::string _presetURL): presetURL(_presetURL)
  {
+--- projectM/projectM.hpp	2011-11-09 22:33:29.997034349 +0100
++++ projectM.new/projectM.hpp	2011-11-09 22:32:27.064722289 +0100
+@@ -57,7 +57,9 @@
+ #include "event.h"
+ #include "fatal.h"
+ #include "PCM.hpp"
+-#include "pthread.h"
++#ifdef USE_THREADS
++# include "pthread.h"
++#endif
+ class PipelineContext;
+ 
+ class BeatDetect;
+@@ -309,10 +311,12 @@
+ 
+   RenderItemMatcher * _matcher;
+   MasterRenderItemMerge * _merger;
++#ifdef USE_THREADS
+   pthread_mutex_t mutex;
+ 
+   pthread_cond_t  condition;
+   pthread_t thread;
++#endif
+   bool running;
+ 
+   Pipeline* currentPipe;