mirror of
https://code.videolan.org/videolan/vlc
synced 2024-10-03 01:31:53 +02:00
Contribs: update pthreads to 2.9.1
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
This commit is contained in:
parent
ef24315035
commit
a17f1b372f
@ -1 +1 @@
|
||||
d86040b18641b52f2de81468e06e2885d0f0ed47cc5c9c90ca33614ed53ddd60167723b46eb477d905ad69f93b6b9002762589ba6c351f78a8041109cdbf287e pthreads-w32-2-8-0-release.tar.gz
|
||||
9c06e85310766834370c3dceb83faafd397da18a32411ca7645c8eb6b9495fea54ca2872f4a3e8d83cb5fdc5dea7f3f0464be5bb9af3222a6534574a184bd551 pthreads-w32-2-9-1-release.tar.gz
|
||||
|
@ -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);
|
||||
|
||||
/*
|
@ -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
|
@ -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)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user