[vlc-devel] [PATCH] pthreads 2.9.1 for the contribs

[Mario Speiß]

Now without the obsolete patches.

Regards,
Mario
---
 contrib/src/pthreads/pthreads-detach.patch |   12 ------------
 contrib/src/pthreads/pthreads-win64.patch  |   23 -----------------------
 contrib/src/pthreads/rules.mak             |    4 +---
 3 files changed, 1 insertions(+), 38 deletions(-)
 delete mode 100644 contrib/src/pthreads/pthreads-detach.patch
 delete mode 100644 contrib/src/pthreads/pthreads-win64.patch

diff --git a/contrib/src/pthreads/pthreads-detach.patch b/contrib/src/pthreads/pthreads-detach.patch
deleted file mode 100644
index 39c2878..0000000
--- a/contrib/src/pthreads/pthreads-detach.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- pthreads.orig/ptw32_processTerminate.c	Mon Jan 26 18:00:34 2009
-+++ pthreads/ptw32_processTerminate.c	Mon Jan 26 18:00:42 2009
-@@ -96,6 +96,9 @@
- 	  tp = tpNext;
- 	}
- 
-+      ptw32_threadReuseTop = PTW32_THREAD_REUSE_EMPTY;
-+      ptw32_threadReuseBottom = PTW32_THREAD_REUSE_EMPTY;
-+
-       LeaveCriticalSection (&ptw32_thread_reuse_lock);
- 
-       /* 
diff --git a/contrib/src/pthreads/pthreads-win64.patch b/contrib/src/pthreads/pthreads-win64.patch
deleted file mode 100644
index aebe07c..0000000
--- a/contrib/src/pthreads/pthreads-win64.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- pthreads/pthread.h	2006-01-24 14:59:57.000000000 +0100
-+++ pthreads.new/pthread.h	2010-04-14 15:49:39.000000000 +0200
-@@ -302,7 +302,7 @@
- #endif
- #endif
- 
--#ifndef HAVE_STRUCT_TIMESPEC
-+#if !defined( HAVE_STRUCT_TIMESPEC ) && !defined( _TIMESPEC_DEFINED )
- #define HAVE_STRUCT_TIMESPEC 1
- struct timespec {
-         long tv_sec;
-diff -urN pthreads/GNUmakefile pthreads.new/GNUmakefile
---- pthreads/GNUmakefile	2010-10-08 22:30:43.029264998 +0200
-+++ pthreads.new/GNUmakefile	2010-10-08 22:30:55.989265032 +0200
-@@ -63,7 +63,7 @@
- XOPT	=
- 
- RCFLAGS		= --include-dir=.
--LFLAGS		= -lwsock32
-+LFLAGS		= -lws2_32
- 
- # ----------------------------------------------------------------------
- # The library can be built with some alternative behaviour to
diff --git a/contrib/src/pthreads/rules.mak b/contrib/src/pthreads/rules.mak
index 7eaaca6..08ea7a5 100644
--- a/contrib/src/pthreads/rules.mak
+++ b/contrib/src/pthreads/rules.mak
@@ -4,7 +4,7 @@ ifndef HAVE_WIN32
 PKGS_FOUND += pthreads
 endif
 
-PTHREADS_W32_VERSION := 2-8-0
+PTHREADS_W32_VERSION := 2-9-1
 PTHREADS_W32_URL := ftp://sources.redhat.com/pub/pthreads-win32/pthreads-w32-$(PTHREADS_W32_VERSION)-release.tar.gz
 
 $(TARBALLS)/pthreads-w32-$(PTHREADS_W32_VERSION)-release.tar.gz:
@@ -15,8 +15,6 @@ $(TARBALLS)/pthreads-w32-$(PTHREADS_W32_VERSION)-release.tar.gz:
 ifdef HAVE_WIN32
 pthreads: pthreads-w32-$(PTHREADS_W32_VERSION)-release.tar.gz .sum-pthreads
 	$(UNPACK)
-	$(APPLY) $(SRC)/pthreads/pthreads-detach.patch
-	$(APPLY) $(SRC)/pthreads/pthreads-win64.patch
 	sed -e 's/^CROSS.*=/CROSS ?=/' -i.orig $(UNPACK_DIR)/GNUmakefile
 	$(MOVE)
 
-- 
1.7.5.4