You've already forked wine-staging
							
							
				mirror of
				https://gitlab.winehq.org/wine/wine-staging.git
				synced 2025-09-12 18:50:20 -07:00 
			
		
		
		
	Updated nvcuvid-CUDA_Video_Support patchset
This commit is contained in:
		| @@ -1,7 +1,7 @@ | ||||
| From 28bc6fd227108131066523f8a3b1ade86f8d3ef8 Mon Sep 17 00:00:00 2001 | ||||
| From e147b47f3aaee67eb898e97d79133ba2d42701ea Mon Sep 17 00:00:00 2001 | ||||
| From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de> | ||||
| Date: Tue, 6 Jan 2015 05:16:36 +0100 | ||||
| Subject: nvcuvid: First implementation. (rev 2) | ||||
| Subject: [PATCH] nvcuvid: First implementation. (rev 2) | ||||
|  | ||||
| Changes by Sebastian Lackner <sebastian@fds-team.de>: | ||||
| * Convert structures properly where the Windows and Linux definition differs. | ||||
| @@ -21,10 +21,10 @@ Changes by Sebastian Lackner <sebastian@fds-team.de>: | ||||
|  create mode 100644 include/nvcuvid.h | ||||
|  | ||||
| diff --git a/configure.ac b/configure.ac | ||||
| index d019e26..559cde4 100644 | ||||
| index 1083cb1..81d622d 100644 | ||||
| --- a/configure.ac | ||||
| +++ b/configure.ac | ||||
| @@ -3140,6 +3140,7 @@ WINE_CONFIG_TEST(dlls/nvapi/tests) | ||||
| @@ -3546,6 +3546,7 @@ WINE_CONFIG_TEST(dlls/nvapi/tests) | ||||
|  WINE_CONFIG_DLL(nvapi64,enable_win64) | ||||
|  WINE_CONFIG_DLL(nvcuda) | ||||
|  WINE_CONFIG_TEST(dlls/nvcuda/tests) | ||||
| @@ -616,25 +616,25 @@ index 0000000..433e7db | ||||
| +@ stdcall cuvidSetVideoSourceState(ptr long) wine_cuvidSetVideoSourceState | ||||
| +@ stdcall cuvidUnmapVideoFrame(ptr long) wine_cuvidUnmapVideoFrame | ||||
| diff --git a/include/Makefile.in b/include/Makefile.in | ||||
| index f9eaf44..e29f3e5 100644 | ||||
| index b7bf57f..8b23127 100644 | ||||
| --- a/include/Makefile.in | ||||
| +++ b/include/Makefile.in | ||||
| @@ -199,6 +199,7 @@ SRCDIR_INCLUDES = \ | ||||
|  	cryptuiapi.h \ | ||||
| @@ -79,6 +79,7 @@ SOURCES = \ | ||||
|  	ctxtcall.idl \ | ||||
|  	cuda.h \ | ||||
|  	custcntl.h \ | ||||
| +	cuviddec.h \ | ||||
|  	cvconst.h \ | ||||
|  	d2dbasetypes.h \ | ||||
|  	d2derr.h \ | ||||
| @@ -478,6 +479,7 @@ SRCDIR_INCLUDES = \ | ||||
|  	d2d1.idl \ | ||||
|  	d2d1_1.idl \ | ||||
| @@ -478,6 +479,7 @@ SOURCES = \ | ||||
|  	ntsecpkg.h \ | ||||
|  	ntstatus.h \ | ||||
|  	nvapi.h \ | ||||
| +	nvcuvid.h \ | ||||
|  	oaidl.idl \ | ||||
|  	objbase.h \ | ||||
|  	objsel.h \ | ||||
|  	odbcinst.h \ | ||||
|  	objectarray.idl \ | ||||
| diff --git a/include/cuviddec.h b/include/cuviddec.h | ||||
| new file mode 100644 | ||||
| index 0000000..e450321 | ||||
| @@ -826,5 +826,5 @@ index 0000000..a192ef6 | ||||
| + | ||||
| +#endif /* __WINE_NVCUVID_H */ | ||||
| --  | ||||
| 2.2.1 | ||||
| 1.9.1 | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user