Steve Lhomme pushed to branch master at VideoLAN / VLC
Commits:
e138206a by Fatih Uzunoglu at 2024-04-02T14:27:04+00:00
contrib: mingw64: do not update d3d9 anymore
The extra APIs were only used by Qt 5 (ANGLE),
so it is not necessary anymore since we use
Qt 6. See 5edcad34 for reference.
This only removes overriding d3d9
with the up-to-date version. It does not
remove d3d9 from the MinGW installation.
- - - - -
1 changed file:
- contrib/src/mingw64/rules.mak
Changes:
=====================================
contrib/src/mingw64/rules.mak
=====================================
@@ -12,13 +12,10 @@ ifndef HAVE_VISUALSTUDIO
ifdef HAVE_WINSTORE
PKGS += winrt_headers alloweduwp
else # !HAVE_WINSTORE
-PKGS += d3d9 dcomp
+PKGS += dcomp
endif # !HAVE_WINSTORE
PKGS += dxva dxvahd mingw11-fixes mft10 d3d12
-ifeq ($(call mingw_at_least, 8), true)
-PKGS_FOUND += d3d9
-endif # MINGW 8
ifeq ($(call mingw_at_least, 9), true)
PKGS_FOUND += d3d12
ifdef HAVE_WINSTORE
@@ -46,7 +43,7 @@ endif
endif # HAVE_WIN32
-PKGS_ALL += winpthreads winrt_headers d3d9 dxva dxvahd dcomp mingw11-fixes
alloweduwp mft10 d3d12
+PKGS_ALL += winpthreads winrt_headers dxva dxvahd dcomp mingw11-fixes
alloweduwp mft10 d3d12
$(TARBALLS)/mingw-w64-$(MINGW64_HASH).tar.xz:
$(call download_git,$(MINGW64_GITURL),,$(MINGW64_HASH))
@@ -152,16 +149,6 @@ MINGW_HEADERS_MFT := mfidl.h mfapi.h mftransform.h
mferror.h mfobjects.h mmreg.h
install $(addprefix $</mingw-w64-headers/include/,$(MINGW_HEADERS_MFT))
"$(PREFIX)/include"
touch $@
-.sum-d3d9: .sum-mingw64
- touch $@
-
-MINGW_HEADERS_D3D9 := d3d9.h d3d9caps.h
-
-.d3d9: mingw64
- install -d "$(PREFIX)/include"
- install $(addprefix
$</mingw-w64-headers/include/,$(MINGW_HEADERS_D3D9)) "$(PREFIX)/include"
- touch $@
-
.sum-dxva: .sum-mingw64
touch $@
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/e138206a0bea793405d18861b3f93d3c20a52a94
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/e138206a0bea793405d18861b3f93d3c20a52a94
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance_______________________________________________
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
