Rebase against 44cb0afb2571984bda8ca1fa084a50c1fc04ac71.

patches/dxva2-Video_Decoder/0005-include-Add-dxva.h-header-file.patch

@@ -1,4 +1,4 @@
-From 08d0f4fee02fa6c01308461b3cecea842439fd15 Mon Sep 17 00:00:00 2001
+From b705357e89463258880e8f7605a33285d5eb0530 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sun, 22 Feb 2015 01:10:21 +0100
 Subject: include: Add dxva.h header file.
@@ -10,20 +10,20 @@ Subject: include: Add dxva.h header file.
  create mode 100644 include/dxva.h
 
 diff --git a/include/Makefile.in b/include/Makefile.in
-index 682072c..94a2b84 100644
+index fd52a5f65a0..31d7fff6c2f 100644
 --- a/include/Makefile.in
 +++ b/include/Makefile.in
-@@ -306,6 +306,7 @@ HEADER_SRCS = \
+@@ -374,6 +374,7 @@ HEADER_SRCS = \
+ 	dxerr8.h \
+ 	dxerr9.h \
  	dxfile.h \
- 	dxgiformat.h \
- 	dxgitype.h \
 +	dxva.h \
  	errorrep.h \
  	errors.h \
  	evcode.h \
 diff --git a/include/dxva.h b/include/dxva.h
 new file mode 100644
-index 0000000..e311488
+index 00000000000..e311488775a
 --- /dev/null
 +++ b/include/dxva.h
 @@ -0,0 +1,215 @@
@@ -243,5 +243,5 @@ index 0000000..e311488
 +
 +#endif /* __WINE_DXVA_H */
 -- 
-2.6.2
+2.14.1
 

patches/dxva2-Video_Decoder/0006-dxva2-tests-Add-tests-for-dxva2-decoder.patch

@@ -1,4 +1,4 @@
-From 8cb1d2c62815a03ded72eebeb9ac0080f8e382a0 Mon Sep 17 00:00:00 2001
+From 0fdcec4ed315b9633390d19258cff7bb209a5fb1 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sun, 22 Feb 2015 01:21:18 +0100
 Subject: dxva2/tests: Add tests for dxva2 decoder.
@@ -12,7 +12,7 @@ Subject: dxva2/tests: Add tests for dxva2 decoder.
  create mode 100644 dlls/dxva2/tests/dxva2.c
 
 diff --git a/configure.ac b/configure.ac
-index edeeb0de6f9..fb65b3b357a 100644
+index faa7791ecb5..8dae7719327 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -3120,6 +3120,7 @@ WINE_CONFIG_DLL(dxgi,,[implib])
@@ -21,7 +21,7 @@ index edeeb0de6f9..fb65b3b357a 100644
  WINE_CONFIG_DLL(dxva2)
 +WINE_CONFIG_TEST(dlls/dxva2/tests)
  WINE_CONFIG_DLL(esent)
- WINE_CONFIG_DLL(evr)
+ WINE_CONFIG_DLL(evr,,[clean])
  WINE_CONFIG_TEST(dlls/evr/tests)
 diff --git a/dlls/dxva2/tests/Makefile.in b/dlls/dxva2/tests/Makefile.in
 new file mode 100644

patches/dxva2-Video_Decoder/0007-dxva2-Initial-implementation-of-MPEG2-decoder-using-.patch

@@ -1,4 +1,4 @@
-From 91d1ab12e88ed9013ca63589f50b635ba9ed46b1 Mon Sep 17 00:00:00 2001
+From 1bef4fd44c776f823f87c1b1014d452888c1e8ea Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sun, 22 Feb 2015 01:25:20 +0100
 Subject: dxva2: Initial implementation of MPEG2 decoder using vaapi backend.
@@ -21,10 +21,10 @@ Subject: dxva2: Initial implementation of MPEG2 decoder using vaapi backend.
  create mode 100644 dlls/dxva2/vaapi.c
 
 diff --git a/configure.ac b/configure.ac
-index c94403b1a9b..52604e2bf35 100644
+index 8dae7719327..9ab6cfafb1d 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -101,6 +101,8 @@ AC_ARG_WITH(xxf86vm,   AS_HELP_STRING([--without-xxf86vm],[do not use XFree vide
+@@ -103,6 +103,8 @@ AC_ARG_WITH(xxf86vm,   AS_HELP_STRING([--without-xxf86vm],[do not use XFree vide
              [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_xf86vmode_h=no; ac_cv_header_X11_extensions_xf86vmproto_h=no; fi])
  AC_ARG_WITH(zlib,      AS_HELP_STRING([--without-zlib],[do not use Zlib (data compression)]),
              [if test "x$withval" = "xno"; then ac_cv_header_zlib_h=no; fi])
@@ -33,7 +33,7 @@ index c94403b1a9b..52604e2bf35 100644
  
  AC_ARG_WITH(wine-tools,AS_HELP_STRING([--with-wine-tools=DIR],[use Wine tools from directory DIR]))
  AC_ARG_WITH(wine64,    AS_HELP_STRING([--with-wine64=DIR],[use the 64-bit Wine in DIR for a Wow64 build]))
-@@ -1157,6 +1159,20 @@ This probably prevents linking to OpenGL. Try deleting the file and restarting c
+@@ -1186,6 +1188,20 @@ This probably prevents linking to OpenGL. Try deleting the file and restarting c
      WINE_WARNING_WITH(opengl,[test -n "$opengl_msg"],[$opengl_msg
  OpenGL and Direct3D won't be supported.])
  
@@ -54,7 +54,7 @@ index c94403b1a9b..52604e2bf35 100644
      CPPFLAGS="$ac_save_CPPFLAGS"
  else
      X_CFLAGS=""
-@@ -3012,7 +3028,7 @@ WINE_CONFIG_LIB(dxerr9)
+@@ -3119,7 +3135,7 @@ WINE_CONFIG_LIB(dxerr9)
  WINE_CONFIG_DLL(dxgi,,[implib])
  WINE_CONFIG_TEST(dlls/dxgi/tests)
  WINE_CONFIG_LIB(dxguid)
@@ -62,7 +62,7 @@ index c94403b1a9b..52604e2bf35 100644
 +WINE_CONFIG_DLL(dxva2,,[clean])
  WINE_CONFIG_TEST(dlls/dxva2/tests)
  WINE_CONFIG_DLL(esent)
- WINE_CONFIG_DLL(evr)
+ WINE_CONFIG_DLL(evr,,[clean])
 diff --git a/dlls/dxva2/Makefile.in b/dlls/dxva2/Makefile.in
 index d484cb14bf2..68a7e3c8c0a 100644
 --- a/dlls/dxva2/Makefile.in
@@ -2643,5 +2643,5 @@ index 46e431a7f29..84222dce558 100644
          return E_NOINTERFACE;
      }
 -- 
-2.11.0
+2.14.1