[vlc-commits] contrib: d3d11: Provide DXGI_COLOR_SPACE_TYPE within dxgi1_4.idl

[Hugo Beauzée-Luyssen]

vlc | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Sun Apr 17 14:25:20 2016 +0200| [09d306f09195f33c3671c11704a070b632b40e2b] | committer: Hugo Beauzée-Luyssen

contrib: d3d11: Provide DXGI_COLOR_SPACE_TYPE within dxgi1_4.idl

Patching dxgitype.h might fail, because the system one will take
precedence over any other version.
Using -I doesn't work, since widl will search in the folder containing
the .idl file including the other

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

 contrib/src/d3d11/dxgi1_4.idl    |   16 ++++++++++++++++
 contrib/src/d3d11/dxgitype.patch |   23 -----------------------
 contrib/src/d3d11/rules.mak      |    2 +-
 3 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/contrib/src/d3d11/dxgi1_4.idl b/contrib/src/d3d11/dxgi1_4.idl
index ec5b3f0..3ada33f 100644
--- a/contrib/src/d3d11/dxgi1_4.idl
+++ b/contrib/src/d3d11/dxgi1_4.idl
@@ -18,6 +18,22 @@
 
 import "dxgi1_3.idl";
 
+typedef enum DXGI_COLOR_SPACE_TYPE {
+    DXGI_COLOR_SPACE_RGB_FULL_G22_NONE_P709         = 0,
+    DXGI_COLOR_SPACE_RGB_FULL_G10_NONE_P709         = 1,
+    DXGI_COLOR_SPACE_RGB_STUDIO_G22_NONE_P709       = 2,
+    DXGI_COLOR_SPACE_RGB_STUDIO_G22_NONE_P2020      = 3,
+    DXGI_COLOR_SPACE_RESERVED                       = 4,
+    DXGI_COLOR_SPACE_YCBCR_FULL_G22_NONE_P709_X601  = 5,
+    DXGI_COLOR_SPACE_YCBCR_STUDIO_G22_LEFT_P601     = 6,
+    DXGI_COLOR_SPACE_YCBCR_FULL_G22_LEFT_P601       = 7,
+    DXGI_COLOR_SPACE_YCBCR_STUDIO_G22_LEFT_P709     = 8,
+    DXGI_COLOR_SPACE_YCBCR_FULL_G22_LEFT_P709       = 9,
+    DXGI_COLOR_SPACE_YCBCR_STUDIO_G22_LEFT_P2020    = 10,
+    DXGI_COLOR_SPACE_YCBCR_FULL_G22_LEFT_P2020      = 11,
+    DXGI_COLOR_SPACE_CUSTOM                         = 0xFFFFFFFF,
+} DXGI_COLOR_SPACE_TYPE;
+
 [
     object,
     local,
diff --git a/contrib/src/d3d11/dxgitype.patch b/contrib/src/d3d11/dxgitype.patch
deleted file mode 100644
index 5165cb9..0000000
--- a/contrib/src/d3d11/dxgitype.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- include/dxgitype.h.new	2015-09-03 05:13:15.000000000 +0300
-+++ include/dxgitype.h	2016-04-16 14:52:29.751438300 +0300
-@@ -93,4 +93,20 @@ typedef struct DXGI_GAMMA_CONTROL {
-     DXGI_RGB GammaCurve[1025];
- } DXGI_GAMMA_CONTROL;
- 
-+typedef enum DXGI_COLOR_SPACE_TYPE {
-+    DXGI_COLOR_SPACE_RGB_FULL_G22_NONE_P709         = 0,
-+    DXGI_COLOR_SPACE_RGB_FULL_G10_NONE_P709         = 1,
-+    DXGI_COLOR_SPACE_RGB_STUDIO_G22_NONE_P709       = 2,
-+    DXGI_COLOR_SPACE_RGB_STUDIO_G22_NONE_P2020      = 3,
-+    DXGI_COLOR_SPACE_RESERVED                       = 4,
-+    DXGI_COLOR_SPACE_YCBCR_FULL_G22_NONE_P709_X601  = 5,
-+    DXGI_COLOR_SPACE_YCBCR_STUDIO_G22_LEFT_P601     = 6,
-+    DXGI_COLOR_SPACE_YCBCR_FULL_G22_LEFT_P601       = 7,
-+    DXGI_COLOR_SPACE_YCBCR_STUDIO_G22_LEFT_P709     = 8,
-+    DXGI_COLOR_SPACE_YCBCR_FULL_G22_LEFT_P709       = 9,
-+    DXGI_COLOR_SPACE_YCBCR_STUDIO_G22_LEFT_P2020    = 10,
-+    DXGI_COLOR_SPACE_YCBCR_FULL_G22_LEFT_P2020      = 11,
-+    DXGI_COLOR_SPACE_CUSTOM                         = 0xFFFFFFFF,
-+} DXGI_COLOR_SPACE_TYPE;
-+
- #endif
diff --git a/contrib/src/d3d11/rules.mak b/contrib/src/d3d11/rules.mak
index e28e487..f27bbbe 100644
--- a/contrib/src/d3d11/rules.mak
+++ b/contrib/src/d3d11/rules.mak
@@ -57,7 +57,7 @@ $(DST_DXGIDEBUG_H): $(TARBALLS)/dxgidebug.idl
 
 $(DST_DXGITYPE_H): $(TARBALLS)/dxgitype.h
 	mkdir -p -- "$(PREFIX)/include/"
-	cp $(TARBALLS)/dxgitype.h $@ && cd "$(PREFIX)/include/" && patch -fp1 < ../$(SRC)/d3d11/dxgitype.patch
+	cp $(TARBALLS)/dxgitype.h $@
 
 $(DST_DXGI12_H): dxgi12
 	mkdir -p -- "$(PREFIX)/include/"