[vlc-devel] [PATCH] contrib: pthreads: use a mingw-w64 version from git

[Steve Lhomme]

---
 contrib/src/pthreads/SHA512SUMS |  2 +-
 contrib/src/pthreads/rules.mak  | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/contrib/src/pthreads/SHA512SUMS b/contrib/src/pthreads/SHA512SUMS
index 82f5956d1b5e..1c0bd8cfd393 100644
--- a/contrib/src/pthreads/SHA512SUMS
+++ b/contrib/src/pthreads/SHA512SUMS
@@ -1 +1 @@
-30e5b2824a24eeb99ab519e3fc134cc9a7f04ee8b853bc8d66a13d1ab74144bf78b93e162bfe6de2a5e61f63c0e620a933b260b02d019cd68cc4b78bd36c67fd  mingw-w64-v7.0.0.tar.bz2
+2ee60942e059c685b52b556bfc4859c308041d540db8c1e469b220c3dee9fc794e94127bb000cda634ac8fb9059028b1ade7de9c91b07319ca4a4056b9eec39a  mingw-w64-a32b622261b490ec4e4f675dfef010d1274c6c4d.tar.xz
diff --git a/contrib/src/pthreads/rules.mak b/contrib/src/pthreads/rules.mak
index 9ec9ffc3b415..8dc5f972f4db 100644
--- a/contrib/src/pthreads/rules.mak
+++ b/contrib/src/pthreads/rules.mak
@@ -2,6 +2,8 @@
 
 WINPTHREADS_VERSION := 7.0.0
 WINPTHREADS_URL := https://sourceforge.net/projects/mingw-w64/files/mingw-w64/mingw-w64-release/mingw-w64-v$(WINPTHREADS_VERSION).tar.bz2/download
+WINPTHREADS_HASH=a32b622261b490ec4e4f675dfef010d1274c6c4d
+WINPTHREADS_GITURL := https://git.code.sf.net/p/mingw-w64/mingw-w64
 
 ifdef HAVE_WIN32
 PKGS += pthreads
@@ -14,14 +16,17 @@ PKGS_ALL += winrt_headers
 endif
 endif
 
+$(TARBALLS)/mingw-w64-$(WINPTHREADS_HASH).tar.xz:
+	$(call download_git,$(WINPTHREADS_GITURL),,$(WINPTHREADS_HASH))
+
 $(TARBALLS)/mingw-w64-v$(WINPTHREADS_VERSION).tar.bz2:
 	$(call download_pkg,$(WINPTHREADS_URL),winpthreads)
 
-.sum-pthreads: mingw-w64-v$(WINPTHREADS_VERSION).tar.bz2
+# .sum-pthreads: mingw-w64-v$(WINPTHREADS_VERSION).tar.bz2
+.sum-pthreads: mingw-w64-$(WINPTHREADS_HASH).tar.xz
 
-pthreads: mingw-w64-v$(WINPTHREADS_VERSION).tar.bz2 .sum-pthreads
+pthreads: mingw-w64-$(WINPTHREADS_HASH).tar.xz .sum-pthreads
 	$(UNPACK)
-	$(APPLY) $(SRC)/pthreads/0001-Add-the-IApplicationData2-storage-interface.patch
 	$(MOVE)
 
 .pthreads: pthreads
-- 
2.26.2