wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-04-13 14:42:51 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against f9e1dbb83d850a2f7cb17079e02de139e2f8b920

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2018-02-23 09:33:49 +11:00
parent 84fb9656a1
commit 9d84ed42f1
42 changed files with 412 additions and 677 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
patches/nvencodeapi-Video_Encoder/0001-nvencodeapi-First-implementation.patch
View File

@ -1,4 +1,4 @@
From 7eca2e6f67b31baf24ff6bebc7359953972bb944 Mon Sep 17 00:00:00 2001
From 094c56e89abefa4d2d4064991b360bebd13be1eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sun, 8 Feb 2015 06:10:26 +0100
Subject: [PATCH] nvencodeapi: First implementation.
@ -21,21 +21,21 @@ Subject: [PATCH] nvencodeapi: First implementation.
create mode 100644 include/nvencodeapi.h
diff --git a/configure.ac b/configure.ac
index 81d622db34..1c5a1dab30 100644
index 70f9486..59d392a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3547,6 +3547,8 @@ WINE_CONFIG_DLL(nvapi64,enable_win64)
@@ -3555,6 +3555,8 @@ WINE_CONFIG_DLL(nvapi64,enable_win64)
WINE_CONFIG_DLL(nvcuda)
WINE_CONFIG_TEST(dlls/nvcuda/tests)
WINE_CONFIG_DLL(nvcuvid)
+WINE_CONFIG_DLL(nvencodeapi,enable_win32)
+WINE_CONFIG_DLL(nvencodeapi64,enable_win64)
WINE_CONFIG_DLL(objsel,,[clean])
WINE_CONFIG_DLL(odbc32,,[implib])
WINE_CONFIG_DLL(odbccp32,,[implib])
WINE_CONFIG_TEST(dlls/odbccp32/tests)
WINE_CONFIG_DLL(odbccu32)
WINE_CONFIG_DLL(ole2.dll16,enable_win16)
diff --git a/dlls/nvencodeapi/Makefile.in b/dlls/nvencodeapi/Makefile.in
new file mode 100644
index 0000000000..a2e58acaf0
index 0000000..a2e58ac
--- /dev/null
+++ b/dlls/nvencodeapi/Makefile.in
@@ -0,0 +1,4 @@
@ -45,7 +45,7 @@ index 0000000000..a2e58acaf0
+ nvencodeapi.c
diff --git a/dlls/nvencodeapi/nvencodeapi.c b/dlls/nvencodeapi/nvencodeapi.c
new file mode 100644
index 0000000000..91a33fd589
index 0000000..91a33fd
--- /dev/null
+++ b/dlls/nvencodeapi/nvencodeapi.c
@@ -0,0 +1,370 @@
@ -421,14 +421,14 @@ index 0000000000..91a33fd589
+}
diff --git a/dlls/nvencodeapi/nvencodeapi.spec b/dlls/nvencodeapi/nvencodeapi.spec
new file mode 100644
index 0000000000..11d74e82d9
index 0000000..11d74e8
--- /dev/null
+++ b/dlls/nvencodeapi/nvencodeapi.spec
@@ -0,0 +1 @@
+@ stdcall NvEncodeAPICreateInstance(ptr)
diff --git a/dlls/nvencodeapi64/Makefile.in b/dlls/nvencodeapi64/Makefile.in
new file mode 100644
index 0000000000..8297ec352b
index 0000000..8297ec3
--- /dev/null
+++ b/dlls/nvencodeapi64/Makefile.in
@@ -0,0 +1,5 @@
@ -439,13 +439,13 @@ index 0000000000..8297ec352b
+ nvencodeapi.c
diff --git a/dlls/nvencodeapi64/nvencodeapi64.spec b/dlls/nvencodeapi64/nvencodeapi64.spec
new file mode 100644
index 0000000000..11d74e82d9
index 0000000..11d74e8
--- /dev/null
+++ b/dlls/nvencodeapi64/nvencodeapi64.spec
@@ -0,0 +1 @@
+@ stdcall NvEncodeAPICreateInstance(ptr)
diff --git a/include/Makefile.in b/include/Makefile.in
index 8b23127251..06dcaba694 100644
index 8b23127..06dcaba 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -480,6 +480,7 @@ SOURCES = \
@ -458,7 +458,7 @@ index 8b23127251..06dcaba694 100644
objectarray.idl \
diff --git a/include/nvencodeapi.h b/include/nvencodeapi.h
new file mode 100644
index 0000000000..45e9fb97f1
index 0000000..45e9fb9
--- /dev/null
+++ b/include/nvencodeapi.h
@@ -0,0 +1,281 @@
@ -744,5 +744,5 @@ index 0000000000..45e9fb97f1
+
+#endif /* __WINE_NVENCODEAPI_H */
--
2.16.1
1.9.1