Added patch to implement support for CUDA GPU video decoding.

README.md

@@ -37,7 +37,7 @@ Wine. All those differences are also documented on the
 Included bug fixes and improvements
 ===================================
 
-**Bugfixes and features included in the next upcoming release [25]:**
+**Bugfixes and features included in the next upcoming release [26]:**
 
 * Add nvapi stubs required for GPU PhysX support
 * Add stub for D3DXComputeNormalMap
@@ -56,6 +56,7 @@ Included bug fixes and improvements
 * IOCTL_DVD_READ_STRUCTURE expects the wrong size of output buffer for some requests ([Wine Bug #37767](https://bugs.winehq.org/show_bug.cgi?id=37767))
 * Implement ID3DXEffect::FindNextValidTechnique ([Wine Bug #34101](https://bugs.winehq.org/show_bug.cgi?id=34101))
 * Implement IDXGIOutput::GetDesc
+* Support for CUDA GPU video decoding
 * Support for D3DXComputeNormals ([Wine Bug #26379](https://bugs.winehq.org/show_bug.cgi?id=26379))
 * Support for ID3DXFont::DrawTextA/W ([Wine Bug #24754](https://bugs.winehq.org/show_bug.cgi?id=24754))
 * Support for SLGetWindowsInformationDWORD ([Wine Bug #36709](https://bugs.winehq.org/show_bug.cgi?id=36709))

debian/changelog

@@ -33,6 +33,7 @@ wine-staging (1.7.34) UNRELEASED; urgency=low
   * Added patches for D3DXComputeNormals and D3DXComputeNormalMap.
   * Added patch for nvapi stubs (required for GPU PhysX support).
   * Added patch to fix NULL dereference in ICSeqCompressFrameStart.
+  * Added patch to implement support for CUDA GPU video decoding.
   * Removed patch to emulate write to CR4 register (accepted upstream).
   * Removed patch with stub for KeSetSystemAffinityThread (accepted upstream).
   * Removed patch to implement combase HSTRING objects (accepted upstream).

patches/nvcuvid-CUDA_Video_Support/definition

@@ -0,0 +1,2 @@
+Fixes: Support for CUDA GPU video decoding
+Depends: nvapi-Stub_DLL

patches/patchinstall.sh

@@ -127,6 +127,7 @@ patch_enable_all ()
 	enable_ntoskrnl_Stub_FileObject="$1"
 	enable_nvcuda_CUDA_Support="$1"
 	enable_nvapi_Stub_DLL="$1"
+	enable_nvcuvid_CUDA_Video_Support="$1"
 	enable_ole32_CoWaitForMultipleHandles="$1"
 	enable_quartz_MediaSeeking_Positions="$1"
 	enable_riched20_IText_Interface="$1"
@@ -413,6 +414,9 @@ patch_enable ()
 		nvapi-Stub_DLL)
 			enable_nvapi_Stub_DLL="$2"
 			;;
+		nvcuvid-CUDA_Video_Support)
+			enable_nvcuvid_CUDA_Video_Support="$2"
+			;;
 		ole32-CoWaitForMultipleHandles)
 			enable_ole32_CoWaitForMultipleHandles="$2"
 			;;
@@ -694,10 +698,10 @@ if [ "$enable_wined3d_CSMT_Main" -eq 1 ]; then
 fi
 
 if [ "$enable_wined3d_CSMT_Helper" -eq 1 ]; then
-	[ "$enable_makedep_PARENTSPEC" -gt 1 ] && abort "ERROR: Patchset makedep-PARENTSPEC disabled, but wined3d-CSMT_Helper depends on that." >&2
 	[ "$enable_wined3d_DXTn" -gt 1 ] && abort "ERROR: Patchset wined3d-DXTn disabled, but wined3d-CSMT_Helper depends on that." >&2
-	enable_makedep_PARENTSPEC=1
+	[ "$enable_makedep_PARENTSPEC" -gt 1 ] && abort "ERROR: Patchset makedep-PARENTSPEC disabled, but wined3d-CSMT_Helper depends on that." >&2
 	enable_wined3d_DXTn=1
+	enable_makedep_PARENTSPEC=1
 fi
 
 if [ "$enable_server_ACL_Compat" -eq 1 ]; then
@@ -715,6 +719,11 @@ if [ "$enable_server_Stored_ACLs" -eq 1 ]; then
 	enable_ntdll_DOS_Attributes=1
 fi
 
+if [ "$enable_nvcuvid_CUDA_Video_Support" -eq 1 ]; then
+	[ "$enable_nvapi_Stub_DLL" -gt 1 ] && abort "ERROR: Patchset nvapi-Stub_DLL disabled, but nvcuvid-CUDA_Video_Support depends on that." >&2
+	enable_nvapi_Stub_DLL=1
+fi
+
 if [ "$enable_nvapi_Stub_DLL" -eq 1 ]; then
 	[ "$enable_nvcuda_CUDA_Support" -gt 1 ] && abort "ERROR: Patchset nvcuda-CUDA_Support disabled, but nvapi-Stub_DLL depends on that." >&2
 	enable_nvcuda_CUDA_Support=1
@@ -2046,6 +2055,19 @@ if [ "$enable_nvapi_Stub_DLL" -eq 1 ]; then
 	) >> "$patchlist"
 fi
 
+# Patchset nvcuvid-CUDA_Video_Support
+# |
+# | Modified files:
+# |   *	configure.ac, dlls/nvcuvid/Makefile.in, dlls/nvcuvid/nvcuvid.c, dlls/nvcuvid/nvcuvid.spec, include/Makefile.in,
+# | 	include/cuviddec.h, include/nvcuvid.h
+# |
+if [ "$enable_nvcuvid_CUDA_Video_Support" -eq 1 ]; then
+	patch_apply nvcuvid-CUDA_Video_Support/0001-nvcuvid-First-implementation.patch
+	(
+		echo '+    { "Michael Müller", "nvcuvid: First implementation.", 1 },';
+	) >> "$patchlist"
+fi
+
 # Patchset ole32-CoWaitForMultipleHandles
 # |
 # | Modified files: