Rebase against 7d77d330a5b60be918dbf17d9d9ca357d93bff29

2025-04-13 14:42:51 -07:00 · 2019-06-05 09:35:37 +10:00
parent 3287f0fc9b
commit a1afc6f151
7 changed files with 94 additions and 76 deletions
--- a/patches/dxva2-Video_Decoder/0001-dxva2-Implement-semi-stub-for-Direct3DDeviceManager9.patch
+++ b/patches/dxva2-Video_Decoder/0001-dxva2-Implement-semi-stub-for-Direct3DDeviceManager9.patch
@@ -1,25 +1,28 @@
-From 52d613dcbeb8d00cf334c0cc46aed7d91eec355e Mon Sep 17 00:00:00 2001
+From 34fefc056a65053060d7de738087f2527b7ed6bb Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Tue, 10 Feb 2015 16:34:05 +0100
-Subject: dxva2: Implement semi-stub for Direct3DDeviceManager9 interface.
+Subject: [PATCH] dxva2: Implement semi-stub for Direct3DDeviceManager9
+ interface.

 ---
 dlls/dxva2/Makefile.in     |   2 +
- dlls/dxva2/devicemanager.c | 212 +++++++++++++++++++++++++++++++++++++++++++++
- dlls/dxva2/dxva2_private.h |  21 +++++
+ dlls/dxva2/devicemanager.c | 212 +++++++++++++++++++++++++++++++++++++
+ dlls/dxva2/dxva2_private.h |  21 ++++
 dlls/dxva2/main.c          |   7 +-
 4 files changed, 240 insertions(+), 2 deletions(-)
 create mode 100644 dlls/dxva2/devicemanager.c
 create mode 100644 dlls/dxva2/dxva2_private.h

 diff --git a/dlls/dxva2/Makefile.in b/dlls/dxva2/Makefile.in
-index 7b9ef6fe7c0..27c653d3f20 100644
+index 44e125e9b5f..5c3e3842d79 100644
 --- a/dlls/dxva2/Makefile.in
 +++ b/dlls/dxva2/Makefile.in
-@@ -1,4 +1,6 @@
+@@ -1,6 +1,8 @@
 MODULE = dxva2.dll
 +IMPORTS = ole32
 
+ EXTRADLLFLAGS = -mno-cygwin
+ 
 C_SRCS = \
 +	devicemanager.c \
 	main.c
@@ -297,5 +300,5 @@ index 782f0dfa3d4..df8f2030104 100644
 
 HRESULT WINAPI DXVA2CreateVideoService( IDirect3DDevice9 *device, REFIID riid, void **ppv )
 -- 
-2.11.0
+2.20.1

--- a/patches/dxva2-Video_Decoder/0007-dxva2-Initial-implementation-of-MPEG2-decoder-using-.patch
+++ b/patches/dxva2-Video_Decoder/0007-dxva2-Initial-implementation-of-MPEG2-decoder-using-.patch
@@ -1,20 +1,20 @@
-From 161924178484a0b2835946704241d2ae287202f1 Mon Sep 17 00:00:00 2001
+From 935b985d2e4fab7402030c71ff1a6ba0abdd9874 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: [PATCH] dxva2: Initial implementation of MPEG2 decoder using
- vaapi backend.
+Subject: [PATCH] dxva2: Initial implementation of MPEG2 decoder using vaapi
+ backend.

 ---
 configure.ac                |  16 +
 dlls/dxva2/Makefile.in      |  12 +-
- dlls/dxva2/backend.idl      |  96 ++++++
- dlls/dxva2/dxva2_private.h  | 115 ++++++-
- dlls/dxva2/genericdecoder.c | 432 +++++++++++++++++++++++++
+ dlls/dxva2/backend.idl      |  96 +++++
+ dlls/dxva2/dxva2_private.h  | 115 +++++-
+ dlls/dxva2/genericdecoder.c | 432 ++++++++++++++++++++
 dlls/dxva2/main.c           |  70 +++-
 dlls/dxva2/tests/dxva2.c    |  23 +-
- dlls/dxva2/vaapi-mpeg2.c    | 753 +++++++++++++++++++++++++++++++++++++++++++
- dlls/dxva2/vaapi.c          | 767 ++++++++++++++++++++++++++++++++++++++++++++
- dlls/dxva2/videoservices.c  |  74 ++---
+ dlls/dxva2/vaapi-mpeg2.c    | 753 +++++++++++++++++++++++++++++++++++
+ dlls/dxva2/vaapi.c          | 767 ++++++++++++++++++++++++++++++++++++
+ dlls/dxva2/videoservices.c  |  74 ++--
 10 files changed, 2292 insertions(+), 66 deletions(-)
 create mode 100644 dlls/dxva2/backend.idl
 create mode 100644 dlls/dxva2/genericdecoder.c
@@ -22,19 +22,19 @@ Subject: [PATCH] dxva2: Initial implementation of MPEG2 decoder using
 create mode 100644 dlls/dxva2/vaapi.c

 diff --git a/configure.ac b/configure.ac
-index 4a93549..f5a20d5 100644
+index 58e5211e9bc..53aea6188ca 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -107,6 +107,8 @@ AC_ARG_WITH(xxf86vm,   AS_HELP_STRING([--without-xxf86vm],[do not use XFree vide
+@@ -110,6 +110,8 @@ AC_ARG_WITH(xslt,      AS_HELP_STRING([--without-xslt],[do not use XSLT]))
+ AC_ARG_WITH(xxf86vm,   AS_HELP_STRING([--without-xxf86vm],[do not use XFree video mode extension]),
             [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])
+ AC_ARG_WITH(zlib,      AS_HELP_STRING([--without-zlib],[do not use Zlib (data compression)]))
 +AC_ARG_WITH(va,        AS_HELP_STRING([--without-va],[do not use VA (GPU video acceleration)]),
 +            [if test "x$withval" = "xno"; then ac_cv_header_va_va_x11_h=no; fi])
 
 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]))
-@@ -1210,6 +1212,20 @@ This probably prevents linking to OpenGL. Try deleting the file and restarting c
+@@ -1292,6 +1294,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.])
 
@@ -56,10 +56,10 @@ index 4a93549..f5a20d5 100644
 else
     X_CFLAGS=""
 diff --git a/dlls/dxva2/Makefile.in b/dlls/dxva2/Makefile.in
-index d484cb1..68a7e3c 100644
+index e4c90b5231e..b42cfae525e 100644
 --- a/dlls/dxva2/Makefile.in
 +++ b/dlls/dxva2/Makefile.in
-@@ -1,8 +1,14 @@
+@@ -1,10 +1,16 @@
 MODULE = dxva2.dll
 -IMPORTS = ole32
 +IMPORTS = ole32 advapi32
@@ -67,6 +67,8 @@ index d484cb1..68a7e3c 100644
 +IDL_SRCS = \
 +	backend.idl
 
+ EXTRADLLFLAGS = -mno-cygwin
+ 
 C_SRCS = \
 	devicemanager.c \
 +	genericdecoder.c \
@@ -79,7 +81,7 @@ index d484cb1..68a7e3c 100644
 +	videoservices.c
 diff --git a/dlls/dxva2/backend.idl b/dlls/dxva2/backend.idl
 new file mode 100644
-index 0000000..8d48835
+index 00000000000..8d488351ff2
 --- /dev/null
 +++ b/dlls/dxva2/backend.idl
@@ -0,0 +1,96 @@
@@ -180,7 +182,7 @@ index 0000000..8d48835
 +        [out] IWineVideoDecoder **decoder);
 +}
 diff --git a/dlls/dxva2/dxva2_private.h b/dlls/dxva2/dxva2_private.h
-index f0068b6..f518637 100644
+index f0068b68891..f51863739b0 100644
 --- a/dlls/dxva2/dxva2_private.h
 +++ b/dlls/dxva2/dxva2_private.h
@@ -1,5 +1,5 @@
@@ -315,7 +317,7 @@ index f0068b6..f518637 100644
 +#endif /* HAVE_VAAPI */
 diff --git a/dlls/dxva2/genericdecoder.c b/dlls/dxva2/genericdecoder.c
 new file mode 100644
-index 0000000..3903d6b
+index 00000000000..3903d6b0b46
 --- /dev/null
 +++ b/dlls/dxva2/genericdecoder.c
@@ -0,0 +1,432 @@
@@ -752,7 +754,7 @@ index 0000000..3903d6b
 +    return S_OK;
 +}
 diff --git a/dlls/dxva2/main.c b/dlls/dxva2/main.c
-index 0382b5f..3006f17 100644
+index 0382b5fb00a..3006f175b7f 100644
 --- a/dlls/dxva2/main.c
 +++ b/dlls/dxva2/main.c
@@ -32,6 +32,8 @@
@@ -846,7 +848,7 @@ index 0382b5f..3006f17 100644
 
     return TRUE;
 diff --git a/dlls/dxva2/tests/dxva2.c b/dlls/dxva2/tests/dxva2.c
-index dcbb990..c28be4d 100644
+index dcbb990ee5c..c28be4d8e3c 100644
 --- a/dlls/dxva2/tests/dxva2.c
 +++ b/dlls/dxva2/tests/dxva2.c
@@ -1,7 +1,7 @@
@@ -927,7 +929,7 @@ index dcbb990..c28be4d 100644
     IDirectXVideoDecoderService_Release(service);
 diff --git a/dlls/dxva2/vaapi-mpeg2.c b/dlls/dxva2/vaapi-mpeg2.c
 new file mode 100644
-index 0000000..7b7f61d
+index 00000000000..7b7f61db755
 --- /dev/null
 +++ b/dlls/dxva2/vaapi-mpeg2.c
@@ -0,0 +1,753 @@
@@ -1686,7 +1688,7 @@ index 0000000..7b7f61d
 +#endif /* HAVE_VAAPI */
 diff --git a/dlls/dxva2/vaapi.c b/dlls/dxva2/vaapi.c
 new file mode 100644
-index 0000000..80e63bf
+index 00000000000..80e63bf38d9
 --- /dev/null
 +++ b/dlls/dxva2/vaapi.c
@@ -0,0 +1,767 @@
@@ -2458,7 +2460,7 @@ index 0000000..80e63bf
 +
 +#endif /* HAVE_VAAPI */
 diff --git a/dlls/dxva2/videoservices.c b/dlls/dxva2/videoservices.c
-index 46e431a..84222dc 100644
+index 46e431a7f29..84222dce558 100644
 --- a/dlls/dxva2/videoservices.c
 +++ b/dlls/dxva2/videoservices.c
@@ -1,5 +1,5 @@
@@ -2635,5 +2637,5 @@ index 46e431a..84222dc 100644
         return E_NOINTERFACE;
     }
 -- 
-2.7.4
+2.20.1

--- a/patches/dxva2-Video_Decoder/0013-Revert-dxva2-Build-with-msvcrt.patch
+++ b/patches/dxva2-Video_Decoder/0013-Revert-dxva2-Build-with-msvcrt.patch
@@ -0,0 +1,26 @@
+From 942e949aefa0ced5829eb69580ca6a00492fb542 Mon Sep 17 00:00:00 2001
+From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
+Date: Wed, 5 Jun 2019 08:54:39 +1000
+Subject: [PATCH] Revert "dxva2: Build with msvcrt."
+
+This reverts commit 63cb594f01f25572e78356d0950790437bf99c34.
+---
+ dlls/dxva2/Makefile.in | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/dlls/dxva2/Makefile.in b/dlls/dxva2/Makefile.in
+index 12ce8b2c1f2..35c42715b0f 100644
+--- a/dlls/dxva2/Makefile.in
+++ b/dlls/dxva2/Makefile.in
+@@ -4,8 +4,6 @@ IMPORTS = ole32 advapi32
+ IDL_SRCS = \
+ 	backend.idl
+ 
+-EXTRADLLFLAGS = -mno-cygwin
+-
+ C_SRCS = \
+ 	devicemanager.c \
+ 	genericdecoder.c \
+-- 
+2.20.1
+