[vlc-commits] [Git][videolan/vlc][master] contrib: update mingw-w64 to v10

[Rémi Denis-Courmont (@Courmisch)]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
e3e0854b by Steve Lhomme at 2022-04-10T13:38:34+00:00
contrib: update mingw-w64 to v10

This is the latest stable release. We can update our Docker images as well.

We can now detect the proper dcomp.h with the installed mingw-w64 version..
See 50e71ad6fb43c710d64ac4f3945cdd11ccfe5aa5

- - - - -


2 changed files:

- contrib/src/pthreads/SHA512SUMS
- contrib/src/pthreads/rules.mak


Changes:

=====================================
contrib/src/pthreads/SHA512SUMS
=====================================
@@ -1 +1 @@
-4e2ffbb6cbe59c65f60d3f0035d1c2065b14ad16a63ae7a297f5c61d83b8e1b6847e3579996b91b2b9d807e3b9c1de2c60ee01a3349c9dd5f6e13d36f25221ea  mingw-w64-2c35e8ff0d33916bd490e8932cba2049cd1af3d0.tar.xz
+3c0827af7c40809a867758f6cd9ef3ff0c988b43082345bf725e03949af95968d634ace99a7ffae323189549221dcb5d861de9e801f1fbc7904e446641b60516  mingw-w64-v10.0.0.tar.bz2
\ No newline at end of file


=====================================
contrib/src/pthreads/rules.mak
=====================================
@@ -1,6 +1,6 @@
 # winpthreads, dxvahd, winrt_headers, dcomp
 
-MINGW64_VERSION := 9.0.0
+MINGW64_VERSION := 10.0.0
 MINGW64_URL := https://sourceforge.net/projects/mingw-w64/files/mingw-w64/mingw-w64-release/mingw-w64-v$(MINGW64_VERSION).tar.bz2/download
 MINGW64_HASH=2c35e8ff0d33916bd490e8932cba2049cd1af3d0
 MINGW64_GITURL := https://git.code.sf.net/p/mingw-w64/mingw-w64
@@ -27,7 +27,7 @@ endif # MINGW 10
 ifeq ($(HAVE_WINPTHREAD),)
 PKGS_FOUND += pthreads
 endif
-ifneq ($(shell $(CC) $(CFLAGS) -E -dM -include dcomp.h - < /dev/null | grep -m 1 IDCompositionDevice3),)
+ifeq ($(call mingw_at_least, 10), true)
 PKGS_FOUND += dcomp
 endif
 endif # !HAVE_VISUALSTUDIO
@@ -39,11 +39,11 @@ $(TARBALLS)/mingw-w64-$(MINGW64_HASH).tar.xz:
 $(TARBALLS)/mingw-w64-v$(MINGW64_VERSION).tar.bz2:
 	$(call download_pkg,$(MINGW64_URL),winpthreads)
 
-# .sum-pthreads: mingw-w64-v$(MINGW64_VERSION).tar.bz2
-.sum-pthreads: mingw-w64-$(MINGW64_HASH).tar.xz
+.sum-pthreads: mingw-w64-v$(MINGW64_VERSION).tar.bz2
+# .sum-pthreads: mingw-w64-$(MINGW64_HASH).tar.xz
 
-# pthreads: mingw-w64-v$(MINGW64_VERSION).tar.bz2 .sum-pthreads
-pthreads: mingw-w64-$(MINGW64_HASH).tar.xz .sum-pthreads
+pthreads: mingw-w64-v$(MINGW64_VERSION).tar.bz2 .sum-pthreads
+# pthreads: mingw-w64-$(MINGW64_HASH).tar.xz .sum-pthreads
 	$(UNPACK)
 	$(MOVE)
 



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/e3e0854b6dd61d0dde8017257b9e04713a00670a

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/e3e0854b6dd61d0dde8017257b9e04713a00670a
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance