contrib: Remove local pthreads-w32 in favor of winpthreads.

Cross-compiling for Windows now requires winpthreads which is part of the toolchain provided by scripts/mingw-w64-build, and similar packages provided by Linux distros.

diff --git a/THANKS.markdown b/THANKS.markdown
index d7033573a309e416ee4402f13bb8a55287c51624..eb843a48287c18777f456b86e90d35c295e17ccf 100644 (file)
--- a/THANKS.markdown
+++ b/THANKS.markdown
@@ -23,7 +23,6 @@ HandBrake uses many cool libraries from the GNU/Linux world. We thank them and t
 - [libmpeg2dec](http://libmpeg2.sourceforge.net/)
 - [libogg](https://xiph.org/ogg/)
 - [libopus](https://www.opus-codec.org/)
-- [libpthreadsw32](https://sourceware.org/pthreads-win32/)
 - [libsamplerate](http://mega-nerd.com/SRC/)
 - [libspeex](https://www.speex.org/)
 - [libtheora](https://theora.org/)

diff --git a/contrib/fribidi/module.defs b/contrib/fribidi/module.defs
index a37a173c14d33c21e3f637d5e36861df2c50de2a..ecc59c6a34bce7d140dff5a5d4b2092716579e7d 100644 (file)
--- a/contrib/fribidi/module.defs
+++ b/contrib/fribidi/module.defs
@@ -1,7 +1,3 @@
-ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system))
-__deps__ := PTHREADW32
-endif
-
 $(eval $(call import.MODULE.defs,FRIBIDI,fribidi))
 $(eval $(call import.CONTRIB.defs,FRIBIDI))
 

diff --git a/contrib/libvpx/module.defs b/contrib/libvpx/module.defs
index d046727132a163235d39b2eff2665a6e19eb9972..838f3a226225ad4473f5d1a485ffbf3d880114d5 100644 (file)
--- a/contrib/libvpx/module.defs
+++ b/contrib/libvpx/module.defs
@@ -1,4 +1,4 @@
-$(eval $(call import.MODULE.defs,LIBVPX,libvpx,PTHREADW32))
+$(eval $(call import.MODULE.defs,LIBVPX,libvpx))
 $(eval $(call import.CONTRIB.defs,LIBVPX))
 
 LIBVPX.FETCH.url     = https://download.handbrake.fr/contrib/libvpx-1.7.0.tar.gz

diff --git a/contrib/pthreadw32/module.defs b/contrib/pthreadw32/module.defs
deleted file mode 100644 (file)
index ec9ac1a..0000000
--- a/contrib/pthreadw32/module.defs
+++ /dev/null
@@ -1,37 +0,0 @@
-$(eval $(call import.MODULE.defs,PTHREADW32,pthreadw32))
-$(eval $(call import.CONTRIB.defs,PTHREADW32))
-
-PTHREADW32.FETCH.url     = https://download.handbrake.fr/handbrake/contrib/pthreads-w32-2-9-1-release.tar.gz
-PTHREADW32.FETCH.url    += https://download.videolan.org/pub/contrib/pthreads/pthreads-w32-2-9-1-release.tar.gz
-PTHREADW32.FETCH.sha256  = e6aca7aea8de33d9c8580bcb3a0ea3ec0a7ace4ba3f4e263ac7c7b66bc95fb4d
-
-PTHREADW32.CONFIGURE = $(TOUCH.exe) $@
-
-PTHREADW32.CLEAN.ntargets = realclean
-
-PTHREADW32.BUILD.extra = CROSS=$(BUILD.cross.prefix)
-PTHREADW32.BUILD.ntargets = 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 (dllexport) //g' -e 's/ __declspec (dllimport)//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 (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 (dllexport) //g' -e 's/ __declspec (dllimport)//g' -e 's/__declspec (dllimport) //g' $(CONTRIB.build/)include/semaphore.h
-    $(RM.exe) -f $(CONTRIB.build/)include/semaphore.h.sedbak
-    $(CP.exe) $(PTHREADW32.EXTRACT.dir/)libpthreadGC2.a $(CONTRIB.build/)lib/
-    $(LN.exe) -sf ./libpthreadGC2.a $(CONTRIB.build/)lib/libpthread.a
-    $(TOUCH.exe) $@
-endef
-
-define PTHREADW32.UNINSTALL
-    $(RM.exe) -f $(CONTRIB.build/)lib/libpthreadGC2.a
-    $(RM.exe) -f $(CONTRIB.build/)lib/libpthread.a
-    $(RM.exe) -f $(CONTRIB.build/)include/pthread.h
-    $(RM.exe) -f $(CONTRIB.build/)include/sched.h
-    $(RM.exe) -f $(CONTRIB.build/)include/semaphore.h
-    $(RM.exe) -f $(PTHREADW32.INSTALL.target)
-endef

diff --git a/contrib/pthreadw32/module.rules b/contrib/pthreadw32/module.rules
deleted file mode 100644 (file)
index 7844883..0000000
--- a/contrib/pthreadw32/module.rules
+++ /dev/null
@@ -1,2 +0,0 @@
-$(eval $(call import.MODULE.rules,PTHREADW32))
-$(eval $(call import.CONTRIB.rules,PTHREADW32))

diff --git a/contrib/x264/module.defs b/contrib/x264/module.defs
index ea8899e01cabd1bfb18e646cad321f78eb0ac575..e407033159f36606ba0cb17fdfeb80c539d6a9a1 100644 (file)
--- a/contrib/x264/module.defs
+++ b/contrib/x264/module.defs
@@ -1,4 +1,4 @@
-$(eval $(call import.MODULE.defs,X264,x264,PTHREADW32))
+$(eval $(call import.MODULE.defs,X264,x264))
 $(eval $(call import.CONTRIB.defs,X264))
 
 X264.FETCH.url     = https://download.handbrake.fr/handbrake/contrib/x264-snapshot-20180925-2245.tar.bz2

diff --git a/libhb/module.defs b/libhb/module.defs
index e052df996554f68ed2c735851c6a81614b2d230d..aa9964e9ee424fda15bc17d6485b633f240f8262 100644 (file)
--- a/libhb/module.defs
+++ b/libhb/module.defs
@@ -1,6 +1,6 @@
 __deps__ := A52DEC BZIP2 LIBVPX FFMPEG FREETYPE LAME LIBASS LIBDCA \
     LIBDVDREAD LIBDVDNAV LIBICONV LIBSAMPLERATE LIBTHEORA LIBVORBIS LIBOGG \
-    LIBXML2 PTHREADW32 X264 X265 ZLIB LIBBLURAY FDKAAC LIBMFX LIBGNURX JANSSON \
+    LIBXML2 X264 X265 ZLIB LIBBLURAY FDKAAC LIBMFX LIBGNURX JANSSON \
     HARFBUZZ LIBOPUS LIBSPEEX
 
 ifeq (,$(filter $(BUILD.system),darwin cygwin mingw))
@@ -153,10 +153,6 @@ endif
 
 ifeq ($(HAS.pthread),1)
     LIBHB.GCC.l += pthread
-else ifneq ($(HAS.pthreadGC2),1)
-LIBHB.dll.libs += $(CONTRIB.build/)lib/libpthreadGC2.a
-else
-    LIBHB.GCC.l += pthreadGC2
 endif
 
 ifneq ($(HAS.bz2),1)

diff --git a/make/configure.py b/make/configure.py
index bd95855150a9bc8e05f53eca60be28239020ba4f..c3916dfc117e3e8de806377e9324a84c54177d16 100644 (file)
--- a/make/configure.py
+++ b/make/configure.py
@@ -1650,7 +1650,6 @@ int main ()
   return 0;
 }
 """
-        pthreadGC2 = LDProbe( 'static pthread', '%s -static' % Tools.gcc.pathname, '-lpthreadGC2', pthread_test )
         pthread = LDProbe( 'static pthread', '%s -static' % Tools.gcc.pathname, '-lpthread', pthread_test )
         pthread.run()
 
@@ -1887,8 +1886,6 @@ int main()
         doc.addBlank()
         if not dlfcn.fail:
             doc.add( 'HAS.dlfcn', 1 )
-        if not pthreadGC2.fail:
-            doc.add( 'HAS.pthreadGC2', 1 )
         elif not pthread.fail:
             doc.add( 'HAS.pthread', 1 )
         if not bz2.fail:

diff --git a/make/include/main.defs b/make/include/main.defs
index eaf2d72d6e51afd1fd16c12e45f427a4b21fdfa6..5a5118e600784beca0b5b754cd7598171facae99 100644 (file)
--- a/make/include/main.defs
+++ b/make/include/main.defs
@@ -52,14 +52,6 @@ MODULES += contrib/libdvdread
 MODULES += contrib/libdvdnav
 MODULES += contrib/libbluray
 
-ifneq (,$(filter $(BUILD.system),mingw))
-ifneq ($(HAS.pthread),1)
-ifneq ($(HAS.pthreadGC2),1)
-    MODULES += contrib/pthreadw32
-endif
-endif
-endif
-
 ifeq (1,$(FEATURE.qsv))
     MODULES += contrib/libmfx
 endif