wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-01-28 22:04:43 -08:00
Code Issues Packages Projects Releases Wiki Activity

nvcuvid-CUDA_Video_Support: Fix mistakenly deleted lines.

Browse Source
This commit is contained in:
Zebediah Figura 2018-02-23 10:03:55 -06:00
parent 6bc9218559
commit 2d66ecce58
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
patches/nvcuvid-CUDA_Video_Support/0001-nvcuvid-First-implementation.patch
View File

@ -1,4 +1,4 @@
From 1a242643243cb7b56a077442344a7e27fc857890 Mon Sep 17 00:00:00 2001
From cee88b40a2b505c62f0253773085324a1d439187 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: [PATCH] nvcuvid: First implementation. (rev 2)
@ -6,14 +6,14 @@ 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.
---
configure.ac | 4 +-
configure.ac | 1 +
dlls/nvcuvid/Makefile.in | 4 +
dlls/nvcuvid/nvcuvid.c | 537 ++++++++++++++++++++++++++++++++++++++++++++++
dlls/nvcuvid/nvcuvid.spec | 24 +++
include/Makefile.in | 2 +
include/cuviddec.h | 99 +++++++++
include/nvcuvid.h | 79 +++++++
7 files changed, 746 insertions(+), 3 deletions(-)
7 files changed, 746 insertions(+)
create mode 100644 dlls/nvcuvid/Makefile.in
create mode 100644 dlls/nvcuvid/nvcuvid.c
create mode 100644 dlls/nvcuvid/nvcuvid.spec
@ -21,20 +21,17 @@ Changes by Sebastian Lackner <sebastian@fds-team.de>:
create mode 100644 include/nvcuvid.h
diff --git a/configure.ac b/configure.ac
index ce47cd0..70f9486 100644
index 3ae50e9..e2a09d7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3554,9 +3554,7 @@ WINE_CONFIG_TEST(dlls/nvapi/tests)
@@ -3477,6 +3477,7 @@ WINE_CONFIG_TEST(dlls/nvapi/tests)
WINE_CONFIG_DLL(nvapi64,enable_win64)
WINE_CONFIG_DLL(nvcuda)
WINE_CONFIG_TEST(dlls/nvcuda/tests)
-WINE_CONFIG_DLL(objsel)
-WINE_CONFIG_DLL(odbc32)
-WINE_CONFIG_DLL(odbccp32)
+WINE_CONFIG_DLL(nvcuvid)
WINE_CONFIG_TEST(dlls/odbccp32/tests)
WINE_CONFIG_DLL(odbccu32)
WINE_CONFIG_DLL(ole2.dll16,enable_win16)
WINE_CONFIG_DLL(objsel)
WINE_CONFIG_DLL(odbc32)
WINE_CONFIG_DLL(odbccp32)
diff --git a/dlls/nvcuvid/Makefile.in b/dlls/nvcuvid/Makefile.in
new file mode 100644
index 0000000..2c2dc8c
@ -619,10 +616,10 @@ 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 b7bf57f..8b23127 100644
index 11244c0..da5a4f5 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -79,6 +79,7 @@ SOURCES = \
@@ -78,6 +78,7 @@ SOURCES = \
ctxtcall.idl \
cuda.h \
custcntl.h \
@ -630,7 +627,7 @@ index b7bf57f..8b23127 100644
cvconst.h \
d2d1.idl \
d2d1_1.idl \
@@ -478,6 +479,7 @@ SOURCES = \
@@ -475,6 +476,7 @@ SOURCES = \
ntsecpkg.h \
ntstatus.h \
nvapi.h \
@ -829,5 +826,5 @@ index 0000000..a192ef6
+
+#endif /* __WINE_NVCUVID_H */
--
1.9.1
2.7.4