summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--THANKS.markdown1
-rw-r--r--contrib/fribidi/module.defs4
-rw-r--r--contrib/libvpx/module.defs2
-rw-r--r--contrib/pthreadw32/module.defs37
-rw-r--r--contrib/pthreadw32/module.rules2
-rw-r--r--contrib/x264/module.defs2
-rw-r--r--libhb/module.defs6
-rw-r--r--make/configure.py3
-rw-r--r--make/include/main.defs8
9 files changed, 3 insertions, 62 deletions
diff --git a/THANKS.markdown b/THANKS.markdown
index d7033573a..eb843a482 100644
--- 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 a37a173c1..ecc59c6a3 100644
--- 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 d04672713..838f3a226 100644
--- 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
index ec9ac1aba..000000000
--- 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
index 78448835e..000000000
--- 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 ea8899e01..e40703315 100644
--- 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 e052df996..aa9964e9e 100644
--- 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 bd9585515..c3916dfc1 100644
--- 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 eaf2d72d6..5a5118e60 100644
--- 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
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-28 10:53:30 +0000