[vlc-commits] contrib: wine-headers: install dxva.h headers from wine

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Sun Mar  1 12:57:53 2020 +0100| [17cfa33e208f4ca504aad827365ec2820998c87d] | committer: Steve Lhomme

contrib: wine-headers: install dxva.h headers from wine

They are already in mingw64 and might not be matching (dxva vs dxva2api). We
should only use one or the other but not a file from one with the other file
from the other.

New headers will also be needed soon to handle HEVC 444 or AV1 in DXVA and
since we already install the headers from here we could patch them from here.

Also dxva2api.h is not just for D3D9 and doesn't need special handling.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=17cfa33e208f4ca504aad827365ec2820998c87d
---

 contrib/src/wine-headers/rules.mak | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/contrib/src/wine-headers/rules.mak b/contrib/src/wine-headers/rules.mak
index 162e21eabb..47a36086be 100644
--- a/contrib/src/wine-headers/rules.mak
+++ b/contrib/src/wine-headers/rules.mak
@@ -7,18 +7,17 @@ PKGS += wine-headers
 endif
 
 # Order is important since *_(n).idl will depends on *_(n-1).idl
-WINE_EXTRA_HEADERS =
-WINE_IDL_D3D9_HEADERS =
+WINE_EXTRA_HEADERS = dxva.h
 WINE_IDL_HEADERS = \
 	d3d11.idl \
 	d3d11_1.idl d3d11_2.idl d3d11_3.idl \
 	dxgicommon.idl dxgitype.idl dxgiformat.idl \
 	dxgidebug.idl \
-	dxgi.idl dxgi1_2.idl dxgi1_3.idl dxgi1_4.idl dxgi1_5.idl dxgi1_6.idl
+	dxgi.idl dxgi1_2.idl dxgi1_3.idl dxgi1_4.idl dxgi1_5.idl dxgi1_6.idl \
+	dxva2api.idl
 
 ifndef HAVE_VISUALSTUDIO
 WINE_EXTRA_HEADERS += d3d9caps.h d3d9.h
-WINE_IDL_D3D9_HEADERS += dxva2api.idl
 endif
 
 $(TARBALLS)/wine-$(WINE_VERSION).tar.xz:
@@ -43,9 +42,6 @@ wine_widl = echo "GEN $(1)" && \
 	@for header in $(WINE_IDL_HEADERS); do \
 		$(call wine_widl,"`basename $$header idl`h",$$header,); \
 	done
-	@for header in $(WINE_IDL_D3D9_HEADERS); do \
-		$(call wine_widl,"`basename $$header idl`h",$$header,-D_D3D9_H_ -D__C89_NAMELESS); \
-	done
 	@for header in $(WINE_EXTRA_HEADERS); do \
 		echo "CP  $$header"; \
 		cp "wine-headers/include/$$header" "$(PREFIX)/include"; \