diff --git a/patches/dbghelp-Debug_Symbols/0001-dbghelp-Always-check-for-debug-symbols-in-BINDIR.patch b/patches/dbghelp-Debug_Symbols/0001-dbghelp-Always-check-for-debug-symbols-in-BINDIR.patch index 9fc3db8a..2a2ff0b6 100644 --- a/patches/dbghelp-Debug_Symbols/0001-dbghelp-Always-check-for-debug-symbols-in-BINDIR.patch +++ b/patches/dbghelp-Debug_Symbols/0001-dbghelp-Always-check-for-debug-symbols-in-BINDIR.patch @@ -1,7 +1,7 @@ -From f466d59e3eca3c1fd120203d01a746761f301207 Mon Sep 17 00:00:00 2001 +From e920f461eaf4c5d19c0cfc8e9c9a40671269dd93 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Mon, 6 Oct 2014 05:06:06 +0200 -Subject: dbghelp: Always check for debug symbols in BINDIR. +Subject: [PATCH] dbghelp: Always check for debug symbols in BINDIR. --- dlls/dbghelp/Makefile.in | 2 +- @@ -9,7 +9,7 @@ Subject: dbghelp: Always check for debug symbols in BINDIR. 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/dbghelp/Makefile.in b/dlls/dbghelp/Makefile.in -index 3e120e8afe9..6746ca7dbd9 100644 +index f08464cd422..aa7a767110b 100644 --- a/dlls/dbghelp/Makefile.in +++ b/dlls/dbghelp/Makefile.in @@ -1,6 +1,6 @@ @@ -18,13 +18,13 @@ index 3e120e8afe9..6746ca7dbd9 100644 -EXTRADEFS = -D_IMAGEHLP_SOURCE_ +EXTRADEFS = -D_IMAGEHLP_SOURCE_ -DBINDIR="\"${bindir}\"" DELAYIMPORTS = version + EXTRAINCL = $(Z_CFLAGS) EXTRALIBS = $(Z_LIBS) $(CORESERVICES_LIBS) $(COREFOUNDATION_LIBS) - diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c -index 6428955941c..75c0a4c2453 100644 +index 96b16fd5c0c..611533ee098 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c -@@ -1486,9 +1486,11 @@ static BOOL elf_search_and_load_file(struct process* pcs, const WCHAR* filename, +@@ -1644,9 +1644,11 @@ static BOOL elf_search_and_load_file(struct process* pcs, const WCHAR* filename, if (!ret && !strchrW(filename, '/')) { ret = elf_load_file_from_path(pcs, filename, load_offset, dyn_addr, @@ -40,5 +40,5 @@ index 6428955941c..75c0a4c2453 100644 load_offset, dyn_addr, elf_info); } -- -2.11.0 +2.20.1 diff --git a/patches/dxdiagn-Enumerate_DirectSound/0001-dxdiagn-Enumerate-DirectSound-devices-and-add-some-b.patch b/patches/dxdiagn-Enumerate_DirectSound/0001-dxdiagn-Enumerate-DirectSound-devices-and-add-some-b.patch index 957f1fcd..130e5038 100644 --- a/patches/dxdiagn-Enumerate_DirectSound/0001-dxdiagn-Enumerate-DirectSound-devices-and-add-some-b.patch +++ b/patches/dxdiagn-Enumerate_DirectSound/0001-dxdiagn-Enumerate-DirectSound-devices-and-add-some-b.patch @@ -1,4 +1,4 @@ -From 51ba80615215fac54b251e56a374dfab9a2b834b Mon Sep 17 00:00:00 2001 +From 3c3c84a7c1ff6ba6b785bd3d70b5a93912c39d0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Sat, 15 Aug 2015 02:59:17 +0200 Subject: [PATCH] dxdiagn: Enumerate DirectSound devices and add some basic @@ -11,7 +11,7 @@ Subject: [PATCH] dxdiagn: Enumerate DirectSound devices and add some basic 3 files changed, 233 insertions(+), 1 deletion(-) diff --git a/dlls/dxdiagn/Makefile.in b/dlls/dxdiagn/Makefile.in -index c16396e464b..e926d3b2a8a 100644 +index fa4b611f245..88c99803b06 100644 --- a/dlls/dxdiagn/Makefile.in +++ b/dlls/dxdiagn/Makefile.in @@ -1,5 +1,5 @@ @@ -19,13 +19,13 @@ index c16396e464b..e926d3b2a8a 100644 -IMPORTS = strmiids dxguid uuid d3d9 ddraw version ole32 oleaut32 user32 advapi32 +IMPORTS = strmiids dxguid uuid d3d9 ddraw version ole32 oleaut32 user32 advapi32 dsound - C_SRCS = \ - container.c \ + EXTRADLLFLAGS = -mno-cygwin + diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c -index 1fdab5e2db0..6fb9e585dbd 100644 +index 6b6f4e640cc..2626e4e77cb 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c -@@ -38,6 +38,7 @@ +@@ -36,6 +36,7 @@ #include "wine/fil_data.h" #include "psapi.h" #include "wbemcli.h" @@ -33,7 +33,7 @@ index 1fdab5e2db0..6fb9e585dbd 100644 #include "wine/debug.h" -@@ -1354,11 +1355,85 @@ static HRESULT build_displaydevices_tree(IDxDiagContainerImpl_Container *node) +@@ -1364,11 +1365,85 @@ static HRESULT build_displaydevices_tree(IDxDiagContainerImpl_Container *node) return fill_display_information_fallback(node); } @@ -75,7 +75,7 @@ index 1fdab5e2db0..6fb9e585dbd 100644 + /* the default device is enumerated twice, one time without GUID */ + if (!guid) return TRUE; + -+ snprintfW(buffer, sizeof(buffer)/sizeof(WCHAR), deviceid_fmtW, enum_ctx->index); ++ _snwprintf(buffer, sizeof(buffer)/sizeof(WCHAR), deviceid_fmtW, enum_ctx->index); + device = allocate_information_node(buffer); + if (!device) + { @@ -99,8 +99,8 @@ index 1fdab5e2db0..6fb9e585dbd 100644 + return FALSE; + + name = module; -+ if ((p = strrchrW(name, '\\'))) name = p + 1; -+ if ((p = strrchrW(name, '/'))) name = p + 1; ++ if ((p = wcsrchr(name, '\\'))) name = p + 1; ++ if ((p = wcsrchr(name, '/'))) name = p + 1; + + enum_ctx->hr = add_bstr_property(device, szDriverName, name); + if (FAILED(enum_ctx->hr)) @@ -119,7 +119,7 @@ index 1fdab5e2db0..6fb9e585dbd 100644 IDxDiagContainerImpl_Container *cont; cont = allocate_information_node(DxDiag_SoundDevices); -@@ -1367,12 +1442,28 @@ static HRESULT build_directsound_tree(IDxDiagContainerImpl_Container *node) +@@ -1377,12 +1452,28 @@ static HRESULT build_directsound_tree(IDxDiagContainerImpl_Container *node) add_subcontainer(node, cont); @@ -314,5 +314,5 @@ index 936707632a4..c80717cd392 100644 CoUninitialize(); } -- -2.18.0 +2.20.1 diff --git a/patches/dxdiagn-GetChildContainer_Leaf_Nodes/0001-dxdiagn-Calling-GetChildContainer-with-an-empty-stri.patch b/patches/dxdiagn-GetChildContainer_Leaf_Nodes/0001-dxdiagn-Calling-GetChildContainer-with-an-empty-stri.patch index bc788cb4..8b1414f2 100644 --- a/patches/dxdiagn-GetChildContainer_Leaf_Nodes/0001-dxdiagn-Calling-GetChildContainer-with-an-empty-stri.patch +++ b/patches/dxdiagn-GetChildContainer_Leaf_Nodes/0001-dxdiagn-Calling-GetChildContainer-with-an-empty-stri.patch @@ -1,34 +1,19 @@ -From 2c3c01aeaef843cbebf27f6c72384bbd353755a1 Mon Sep 17 00:00:00 2001 +From d1aa9a4e9abd6db9d164d390fa7e942a10efc5cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Sat, 15 Aug 2015 03:58:04 +0200 Subject: [PATCH] dxdiagn: Calling GetChildContainer with an empty string on a leaf container returns the object itself --- - dlls/dxdiagn/container.c | 12 ++++++++++-- + dlls/dxdiagn/container.c | 4 ++-- dlls/dxdiagn/tests/container.c | 25 +++++++++++++++++++++++-- - 2 files changed, 33 insertions(+), 4 deletions(-) + 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/dxdiagn/container.c b/dlls/dxdiagn/container.c -index d167043..6e068e5 100644 +index 87d593a15a7..d84f185a795 100644 --- a/dlls/dxdiagn/container.c +++ b/dlls/dxdiagn/container.c -@@ -162,6 +162,14 @@ static HRESULT WINAPI IDxDiagContainerImpl_GetChildContainer(IDxDiagContainer *i - if (NULL == tmp) return E_FAIL; - lstrcpynW(tmp, pwszContainer, tmp_len); - -+ /* special handling for an empty string and leaf container */ -+ if (!tmp[0] && list_empty(&pContainer->subContainers)) { -+ hr = DXDiag_CreateDXDiagContainer(&IID_IDxDiagContainer, pContainer, This->pProv, (void **)ppInstance); -+ if (SUCCEEDED(hr)) -+ TRACE("Succeeded in getting the container instance\n"); -+ goto out; -+ } -+ - cur = strchrW(tmp, '.'); - while (NULL != cur) { - *cur = '\0'; /* cut tmp string to '.' */ -@@ -169,7 +177,7 @@ static HRESULT WINAPI IDxDiagContainerImpl_GetChildContainer(IDxDiagContainer *i +@@ -167,7 +167,7 @@ static HRESULT WINAPI IDxDiagContainerImpl_GetChildContainer(IDxDiagContainer *i TRACE("Trying to get parent container %s\n", debugstr_w(tmp)); hr = IDxDiagContainerImpl_GetChildContainerInternal(pContainer, tmp, &pContainer); if (FAILED(hr)) @@ -36,8 +21,8 @@ index d167043..6e068e5 100644 + goto out; cur++; /* go after '.' (just replaced by \0) */ tmp = cur; - cur = strchrW(tmp, '.'); -@@ -183,7 +191,7 @@ static HRESULT WINAPI IDxDiagContainerImpl_GetChildContainer(IDxDiagContainer *i + cur = wcschr(tmp, '.'); +@@ -181,7 +181,7 @@ static HRESULT WINAPI IDxDiagContainerImpl_GetChildContainer(IDxDiagContainer *i TRACE("Succeeded in getting the container instance\n"); } @@ -47,7 +32,7 @@ index d167043..6e068e5 100644 return hr; } diff --git a/dlls/dxdiagn/tests/container.c b/dlls/dxdiagn/tests/container.c -index c80717c..7f09fb5 100644 +index c80717cd392..7f09fb5cb82 100644 --- a/dlls/dxdiagn/tests/container.c +++ b/dlls/dxdiagn/tests/container.c @@ -901,7 +901,8 @@ static void test_DxDiag_SystemInfo(void) @@ -118,5 +103,5 @@ index c80717c..7f09fb5 100644 } -- -1.9.1 +2.20.1 diff --git 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 index bac0a5ff..2b29bc79 100644 --- 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 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 diff --git 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 index e33c9c6e..5797ec2a 100644 --- 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?= 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 diff --git a/patches/dxva2-Video_Decoder/0013-Revert-dxva2-Build-with-msvcrt.patch b/patches/dxva2-Video_Decoder/0013-Revert-dxva2-Build-with-msvcrt.patch new file mode 100644 index 00000000..a0c656a3 --- /dev/null +++ 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 +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 + diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 48db21e5..b2a476a0 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,7 +52,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "c92fddae8661233e7699e1914987f0cc4caa8217" + echo "7d77d330a5b60be918dbf17d9d9ca357d93bff29" } # Show version information @@ -3192,6 +3192,7 @@ if test "$enable_dxva2_Video_Decoder" -eq 1; then patch_apply dxva2-Video_Decoder/0010-dxva2-Fill-h264-luma-and-chroma-weights-offsets-with.patch patch_apply dxva2-Video_Decoder/0011-dxva2-Always-destroy-buffers-when-calling-vaRenderPi.patch patch_apply dxva2-Video_Decoder/0012-dxva2-Only-declare-debug-channels-when-they-are-actu.patch + patch_apply dxva2-Video_Decoder/0013-Revert-dxva2-Build-with-msvcrt.patch ( printf '%s\n' '+ { "Sebastian Lackner", "dxva2: Implement semi-stub for Direct3DDeviceManager9 interface.", 1 },'; printf '%s\n' '+ { "Michael Müller", "dxva2: Implement stubbed interfaces for IDirectXVideo{Acceleration,Decoder,Processor}Service.", 1 },'; @@ -3203,6 +3204,7 @@ if test "$enable_dxva2_Video_Decoder" -eq 1; then printf '%s\n' '+ { "Michael Müller", "dxva2: Fill h264 luma and chroma weights / offsets with default values in case they are not specified.", 1 },'; printf '%s\n' '+ { "Michael Müller", "dxva2: Always destroy buffers when calling vaRenderPicture.", 1 },'; printf '%s\n' '+ { "Michael Müller", "dxva2: Only declare debug channels when they are actually used.", 1 },'; + printf '%s\n' '+ { "Alistair Leslie-Hughes", "Revert \"dxva2: Build with msvcrt.\".", 1 },'; ) >> "$patchlist" fi