[vlc-commits] Contribs: update pthreads to 2.9.1

[Mario Speiß]

vlc | branch: master | Mario Speiß <1034-135 at online.de> | Mon Feb 11 21:32:27 2013 +0100| [a17f1b372fd38ea54b3736a2eaead9a3b64da17a] | committer: Jean-Baptiste Kempf

Contribs: update pthreads to 2.9.1

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 contrib/src/pthreads/SHA512SUMS            |    2 +-
 contrib/src/pthreads/pthreads-detach.patch |   12 ------------
 contrib/src/pthreads/pthreads-win64.patch  |   23 -----------------------
 contrib/src/pthreads/rules.mak             |    4 +---
 4 files changed, 2 insertions(+), 39 deletions(-)

diff --git a/contrib/src/pthreads/SHA512SUMS b/contrib/src/pthreads/SHA512SUMS
index b275fd0..f268b3c 100644
--- a/contrib/src/pthreads/SHA512SUMS
+++ b/contrib/src/pthreads/SHA512SUMS
@@ -1 +1 @@
-d86040b18641b52f2de81468e06e2885d0f0ed47cc5c9c90ca33614ed53ddd60167723b46eb477d905ad69f93b6b9002762589ba6c351f78a8041109cdbf287e  pthreads-w32-2-8-0-release.tar.gz
+9c06e85310766834370c3dceb83faafd397da18a32411ca7645c8eb6b9495fea54ca2872f4a3e8d83cb5fdc5dea7f3f0464be5bb9af3222a6534574a184bd551  pthreads-w32-2-9-1-release.tar.gz
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)