diff options
Diffstat (limited to 'contrib')
-rw-r--r-- | contrib/fribidi/module.defs | 4 | ||||
-rw-r--r-- | contrib/libvpx/module.defs | 2 | ||||
-rw-r--r-- | contrib/pthreadw32/module.defs | 37 | ||||
-rw-r--r-- | contrib/pthreadw32/module.rules | 2 | ||||
-rw-r--r-- | contrib/x264/module.defs | 2 |
5 files changed, 2 insertions, 45 deletions
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 |