contrib: Threading fixes in pthreads-w32 and libav.

diff --git a/contrib/ffmpeg/module.defs b/contrib/ffmpeg/module.defs
index 6b0a73c51928840763513b2959eb55801593a79c..a75b49d4ff72fcf67e382002159f24975ed326a7 100644 (file)
--- a/contrib/ffmpeg/module.defs
+++ b/contrib/ffmpeg/module.defs
@@ -47,6 +47,7 @@ FFMPEG.CONFIGURE.extra = \
     --disable-decoder=libvpx_vp9 \
     --enable-zlib \
     --enable-bzlib \
+    --enable-pthreads \
     --cc="$(FFMPEG.GCC.gcc)" \
     --extra-ldflags="$(call fn.ARGS,FFMPEG.GCC,*archs *sysroot *minver ?extra) -L$(call fn.ABSOLUTE,$(CONTRIB.build/)lib)"
 
@@ -67,14 +68,13 @@ FFMPEG.CONFIGURE.extra += \
 
 ## check against tuple: B-SYSTEM where B is { 0 | 1 } for cross-compiling flag
 ifeq (0-cygwin,$(BUILD.cross)-$(BUILD.system))
-    FFMPEG.CONFIGURE.extra += --enable-pthreads --enable-memalign-hack
+    FFMPEG.CONFIGURE.extra += --enable-memalign-hack
     FFMPEG.GCC.args.extra += -fno-common
 else ifeq (darwin,$(BUILD.system))
     ## section for darwin-archs
-    FFMPEG.CONFIGURE.extra += --enable-pthreads --enable-cross-compile --arch=$(BUILD.machine) --target-os=darwin
+    FFMPEG.CONFIGURE.extra += --enable-cross-compile --arch=$(BUILD.machine) --target-os=darwin
 else ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system))
     FFMPEG.CONFIGURE.extra += \
-        --enable-w32threads \
         --enable-memalign-hack \
         --enable-dxva2 \
         --enable-hwaccel=h264_dxva2 \
@@ -83,11 +83,9 @@ else ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system))
         --enable-hwaccel=vc1_dxva2 \
         --enable-hwaccel=wmv3_dxva2 \
         --target-os=mingw32 \
-        --arch=i386 \
+        --arch=$(BUILD.machine) \
         --enable-cross-compile --cross-prefix=$(BUILD.cross.prefix)
     FFMPEG.GCC.args.extra += -fno-common
-else
-    FFMPEG.CONFIGURE.extra += --enable-pthreads
 endif
 
 ifneq (none,$(FFMPEG.GCC.g))

diff --git a/contrib/pthreadw32/module.defs b/contrib/pthreadw32/module.defs
index 0e4a06a1d908233196e853a3640d9bd261287189..15e7f5a23494d37e4a5ba7a52ebd5ec2a3099a6a 100644 (file)
--- a/contrib/pthreadw32/module.defs
+++ b/contrib/pthreadw32/module.defs
@@ -5,18 +5,17 @@ PTHREADW32.FETCH.url = http://download.handbrake.fr/handbrake/contrib/pthreads-w
 PTHREADW32.FETCH.url += ftp://sourceware.org/pub/pthreads-win32/pthreads-w32-2-9-1-release.tar.gz
 PTHREADW32.FETCH.md5 = 36ba827d6aa0fa9f9ae740a35626e2e3
 
-PTHREADW32.CONFIGURE.bootstrap = make realclean;
 PTHREADW32.CONFIGURE = $(TOUCH.exe) $@
 
-PTHREADW32.BUILD.extra = CROSS=$(BUILD.cross.prefix) realclean GC-static
-PTHREADW32.BUILD.ntargets = realclean GC-static
+PTHREADW32.BUILD.extra = CROSS=$(BUILD.cross.prefix) clean GC-static
+PTHREADW32.BUILD.ntargets = clean GC-static
 
 define PTHREADW32.INSTALL
     $(CP.exe) $(PTHREADW32.EXTRACT.dir/)pthread.h $(CONTRIB.build/)include/
     $(SED.exe) -i.sedbak -e 's/ __declspec (dllexport)//g' -e 's/ __declspec (dllimport)//g' $(CONTRIB.build/)include/pthread.h
     $(RM.exe) -f $(CONTRIB.build/)include/pthread.h.sedbak
     $(CP.exe) $(PTHREADW32.EXTRACT.dir/)sched.h $(CONTRIB.build/)include/
-    $(SED.exe) -i.sedbak -e 's/ __declspec (dllexport)//g' -e 's/ __declspec (dllimport)//g' $(CONTRIB.build/)include/sched.h
+    $(SED.exe) -i.sedbak -e 's/ __declspec (dllexport)//g' -e 's/ __declspec (dllimport)//g' -e 's/__declspec (dllimport) //g' $(CONTRIB.build/)include/sched.h
     $(RM.exe) -f $(CONTRIB.build/)include/sched.h.sedbak
     $(CP.exe) $(PTHREADW32.EXTRACT.dir/)semaphore.h $(CONTRIB.build/)include/
     $(SED.exe) -i.sedbak -e 's/ __declspec (dllexport)//g' -e 's/ __declspec (dllimport)//g' $(CONTRIB.build/)include/semaphore.h