[vlc-commits] [Git][videolan/vlc][master] 5 commits: contrib: pthreads: set the PKGS_ALL unconditionally
Steve Lhomme (@robUx4)
gitlab at videolan.org
Wed Oct 5 06:04:05 UTC 2022
Steve Lhomme pushed to branch master at VideoLAN / VLC
Commits:
d94ea709 by Steve Lhomme at 2022-10-05T04:12:00+00:00
contrib: pthreads: set the PKGS_ALL unconditionally
- - - - -
b51872be by Steve Lhomme at 2022-10-05T04:12:00+00:00
contrib: pthreads: do not install D3D9 and DirectCompostion headers for UWP
- - - - -
e58a39f5 by Steve Lhomme at 2022-10-05T04:12:00+00:00
contrib: pthreads: rename the winpthreads thread target
While "pthreads" here actually means mingw-w64.
- - - - -
c2c8219a by Steve Lhomme at 2022-10-05T04:12:00+00:00
contrib: pthreads: rename the generic pthreads target to mingw64
To avoid confusion with what to contrib source contains.
- - - - -
0474cf14 by Steve Lhomme at 2022-10-05T04:12:00+00:00
contrib: mingw64: regroup the winpthreads build decision
- - - - -
13 changed files:
- contrib/src/aom/rules.mak
- contrib/src/libdsm/rules.mak
- contrib/src/libplacebo/rules.mak
- contrib/src/librist/rules.mak
- contrib/src/main.mak
- contrib/src/pthreads/SHA512SUMS → contrib/src/mingw64/SHA512SUMS
- contrib/src/pthreads/rules.mak → contrib/src/mingw64/rules.mak
- contrib/src/mysofa/rules.mak
- contrib/src/openjpeg/rules.mak
- contrib/src/srt/rules.mak
- contrib/src/upnp/rules.mak
- contrib/src/vpx/rules.mak
- contrib/src/zvbi/rules.mak
Changes:
=====================================
contrib/src/aom/rules.mak
=====================================
@@ -25,7 +25,7 @@ endif
DEPS_aom =
ifdef HAVE_WIN32
-DEPS_aom += pthreads $(DEPS_pthreads)
+DEPS_aom += winpthreads $(DEPS_winpthreads)
endif
AOM_CONF := \
=====================================
contrib/src/libdsm/rules.mak
=====================================
@@ -18,7 +18,7 @@ libdsm: libdsm-$(LIBDSM_VERSION).tar.xz .sum-libdsm
DEPS_libdsm = libtasn1 $(DEPS_libtasn1) iconv $(DEPS_iconv)
ifdef HAVE_WIN32
-DEPS_libdsm += pthreads $(DEPS_pthreads)
+DEPS_libdsm += winpthreads $(DEPS_winpthreads)
endif
.libdsm: libdsm crossfile.meson
=====================================
contrib/src/libplacebo/rules.mak
=====================================
@@ -19,7 +19,7 @@ PKGS_FOUND += libplacebo
endif
ifdef HAVE_WIN32
-DEPS_libplacebo += pthreads $(DEPS_pthreads)
+DEPS_libplacebo += winpthreads $(DEPS_winpthreads)
endif
# We don't want vulkan on darwin for now
=====================================
contrib/src/librist/rules.mak
=====================================
@@ -9,7 +9,7 @@ endif
DEPS_librist =
ifdef HAVE_WIN32
-DEPS_librist += pthreads $(DEPS_pthreads)
+DEPS_librist += winpthreads $(DEPS_winpthreads)
endif
ifeq ($(call need_pkg,"librist >= 0.2"),)
=====================================
contrib/src/main.mak
=====================================
@@ -132,7 +132,6 @@ ifneq ($(MINGW_W64_VERSION),)
HAVE_MINGW_W64 := 1
mingw_at_least = $(shell [ $(MINGW_W64_VERSION) -gt $(1) ] && echo true)
endif
-HAVE_WINPTHREAD := $(shell $(CC) $(CFLAGS) -E -dM -include pthread.h - < /dev/null >/dev/null 2>&1 || echo FAIL)
ifndef HAVE_CROSS_COMPILE
LN_S = cp -R
endif
=====================================
contrib/src/pthreads/SHA512SUMS → contrib/src/mingw64/SHA512SUMS
=====================================
=====================================
contrib/src/pthreads/rules.mak → contrib/src/mingw64/rules.mak
=====================================
@@ -6,15 +6,16 @@ MINGW64_HASH=2c35e8ff0d33916bd490e8932cba2049cd1af3d0
MINGW64_GITURL := https://git.code.sf.net/p/mingw-w64/mingw-w64
ifdef HAVE_WIN32
-PKGS += pthreads
+PKGS += winpthreads
ifndef HAVE_VISUALSTUDIO
ifdef HAVE_WINSTORE
PKGS += winrt_headers
-PKGS_ALL += winrt_headers
-endif # HAVE_WINSTORE
-PKGS += d3d9 dxva dxvahd dcomp
-PKGS_ALL += d3d9 dxva dxvahd dcomp
+else # !HAVE_WINSTORE
+PKGS += d3d9 dcomp
+endif # !HAVE_WINSTORE
+PKGS += dxva dxvahd
+
ifeq ($(call mingw_at_least, 8), true)
PKGS_FOUND += d3d9 dxvahd
endif # MINGW 8
@@ -26,37 +27,48 @@ endif # MINGW 9
ifeq ($(call mingw_at_least, 10), true)
PKGS_FOUND += dxva
endif # MINGW 10
-ifeq ($(HAVE_WINPTHREAD),)
-PKGS_FOUND += pthreads
-endif
ifeq ($(call mingw_at_least, 10), true)
PKGS_FOUND += dcomp
endif
endif # !HAVE_VISUALSTUDIO
+
+HAVE_WINPTHREAD := $(shell $(CC) $(CFLAGS) -E -dM -include pthread.h - < /dev/null >/dev/null 2>&1 || echo FAIL)
+ifeq ($(HAVE_WINPTHREAD),)
+PKGS_FOUND += winpthreads
+endif
+
endif # HAVE_WIN32
+PKGS_ALL += winpthreads winrt_headers d3d9 dxva dxvahd dcomp
+
$(TARBALLS)/mingw-w64-$(MINGW64_HASH).tar.xz:
$(call download_git,$(MINGW64_GITURL),,$(MINGW64_HASH))
$(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-mingw64: mingw-w64-v$(MINGW64_VERSION).tar.bz2
+# .sum-mingw64: 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
+mingw64: mingw-w64-v$(MINGW64_VERSION).tar.bz2 .sum-mingw64
+# mingw64: mingw-w64-$(MINGW64_HASH).tar.xz .sum-mingw64
$(UNPACK)
$(MOVE)
-.pthreads: pthreads
+.mingw64: mingw64
+ touch $@
+
+.sum-winpthreads: .sum-mingw64
+ touch $@
+
+.winpthreads: mingw64
$(MAKEBUILDDIR)
$(MAKECONFDIR)/mingw-w64-libraries/winpthreads/configure $(HOSTCONF)
+$(MAKEBUILD)
+$(MAKEBUILD) install
touch $@
-.sum-winrt_headers: .sum-pthreads
+.sum-winrt_headers: .sum-mingw64
touch $@
MINGW_HEADERS_WINRT := \
@@ -69,41 +81,41 @@ MINGW_HEADERS_WINRT := \
asyncinfo.h \
windowscontracts.h
-.winrt_headers: pthreads
+.winrt_headers: mingw64
install -d "$(PREFIX)/include"
install $(addprefix $</mingw-w64-headers/include/,$(MINGW_HEADERS_WINRT)) "$(PREFIX)/include"
touch $@
-.sum-dxvahd: .sum-pthreads
+.sum-dxvahd: .sum-mingw64
touch $@
-.dxvahd: pthreads
+.dxvahd: mingw64
install -d "$(PREFIX)/include"
install $</mingw-w64-headers/include/dxvahd.h "$(PREFIX)/include"
touch $@
-.sum-dcomp: .sum-pthreads
+.sum-dcomp: .sum-mingw64
touch $@
-.dcomp: pthreads
+.dcomp: mingw64
install -d "$(PREFIX)/include"
install $</mingw-w64-headers/include/dcomp.h "$(PREFIX)/include"
touch $@
-.sum-d3d9: .sum-pthreads
+.sum-d3d9: .sum-mingw64
touch $@
MINGW_HEADERS_D3D9 := d3d9.h d3d9caps.h
-.d3d9: pthreads
+.d3d9: mingw64
install -d "$(PREFIX)/include"
install $(addprefix $</mingw-w64-headers/include/,$(MINGW_HEADERS_D3D9)) "$(PREFIX)/include"
touch $@
-.sum-dxva: .sum-pthreads
+.sum-dxva: .sum-mingw64
touch $@
-.dxva: pthreads
+.dxva: mingw64
install -d "$(PREFIX)/include"
install $</mingw-w64-headers/include/dxva.h "$(PREFIX)/include"
touch $@
=====================================
contrib/src/mysofa/rules.mak
=====================================
@@ -11,7 +11,7 @@ endif
DEPS_mysofa += zlib $(DEPS_zlib)
ifdef HAVE_WIN32
-DEPS_mysofa += pthreads $(DEPS_pthreads)
+DEPS_mysofa += winpthreads $(DEPS_winpthreads)
endif
$(TARBALLS)/libmysofa-$(MYSOFA_VERSION).tar.gz:
=====================================
contrib/src/openjpeg/rules.mak
=====================================
@@ -4,7 +4,7 @@ OPENJPEG_VERSION := 2.5.0
OPENJPEG_URL := $(GITHUB)/uclouvain/openjpeg/archive/v$(OPENJPEG_VERSION).tar.gz
ifdef HAVE_WIN32
-DEPS_openjpeg += pthreads $(DEPS_pthreads)
+DEPS_openjpeg += winpthreads $(DEPS_winpthreads)
endif
$(TARBALLS)/openjpeg-v$(OPENJPEG_VERSION).tar.gz:
=====================================
contrib/src/srt/rules.mak
=====================================
@@ -13,7 +13,7 @@ endif
DEPS_srt = gnutls $(DEPS_gnutls)
ifdef HAVE_WIN32
-DEPS_srt += pthreads $(DEPS_pthreads)
+DEPS_srt += winpthreads $(DEPS_winpthreads)
endif
=====================================
contrib/src/upnp/rules.mak
=====================================
@@ -19,7 +19,7 @@ UPNP_CONF += CFLAGS="$(CFLAGS) -DUPNP_STATIC_LIB"
UPNP_CONF += CXXFLAGS="$(CXXFLAGS) -DUPNP_STATIC_LIB"
ifdef HAVE_WIN32
-DEPS_upnp += pthreads $(DEPS_pthreads)
+DEPS_upnp += winpthreads $(DEPS_winpthreads)
endif
ifdef HAVE_WINSTORE
UPNP_CONF += --disable-ipv6 --enable-unspecified_server
=====================================
contrib/src/vpx/rules.mak
=====================================
@@ -34,7 +34,7 @@ endif
DEPS_vpx =
ifdef HAVE_WIN32
-DEPS_vpx += pthreads $(DEPS_pthreads)
+DEPS_vpx += winpthreads $(DEPS_winpthreads)
endif
ifdef HAVE_CROSS_COMPILE
=====================================
contrib/src/zvbi/rules.mak
=====================================
@@ -36,7 +36,7 @@ ZVBICONF := \
--without-doxygen
ifdef HAVE_WIN32
-DEPS_zvbi += pthreads $(DEPS_pthreads)
+DEPS_zvbi += winpthreads $(DEPS_winpthreads)
endif
.zvbi: zvbi
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/702b258dfc7debcf71de3309acdc336505866eae...0474cf148fca1ce486b015219589623a82ce1d7a
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/702b258dfc7debcf71de3309acdc336505866eae...0474cf148fca1ce486b015219589623a82ce1d7a
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance
More information about the vlc-commits
mailing list