wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-09-13 09:17:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

nvcuvid-CUDA_Video_Support: Remove another duplicate struct definition (ancient compilers again ...).

Browse Source
This commit is contained in:
Sebastian Lackner 2015-01-25 05:56:06 +01:00
parent 4b62bd0dbc
commit 9ee1d8c391
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
debian/changelog vendored
View File

@ -1,3 +1,6 @@
wine-staging (1.7.36) UNRELEASED; urgency=low
-- Sebastian Lackner <sebastian@fds-team.de> Sun, 25 Jan 2015 05:58:36 +0100
wine-staging (1.7.35) unstable; urgency=low
* Add stub for KeWaitForMultipleObjects.
* Add support for patchinstall.sh parameters '--no-patchlist' and '--no-autoconf'.

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

@ -1,4 +1,4 @@
From 914b532851757f246d3e2a28a3cd64a00c94b10c Mon Sep 17 00:00:00 2001
From 28bc6fd227108131066523f8a3b1ade86f8d3ef8 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)
@ -12,8 +12,8 @@ Changes by Sebastian Lackner <sebastian@fds-team.de>:
dlls/nvcuvid/nvcuvid.spec | 24 +++
include/Makefile.in | 2 +
include/cuviddec.h | 99 +++++++++
include/nvcuvid.h | 80 +++++++
7 files changed, 747 insertions(+)
include/nvcuvid.h | 79 +++++++
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,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 3918ab1..937b431 100644
index d019e26..559cde4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3137,6 +3137,7 @@ WINE_CONFIG_TEST(dlls/nvapi/tests)
@@ -3140,6 +3140,7 @@ WINE_CONFIG_TEST(dlls/nvapi/tests)
WINE_CONFIG_DLL(nvapi64,enable_win64)
WINE_CONFIG_DLL(nvcuda)
WINE_CONFIG_TEST(dlls/nvcuda/tests)
@ -742,10 +742,10 @@ index 0000000..e450321
+#endif /* __WINE_CUVIDDEC_H */
diff --git a/include/nvcuvid.h b/include/nvcuvid.h
new file mode 100644
index 0000000..216499f
index 0000000..a192ef6
--- /dev/null
+++ b/include/nvcuvid.h
@@ -0,0 +1,80 @@
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2015 Michael Müller
+ *
@ -781,7 +781,6 @@ index 0000000..216499f
+typedef struct _CUVIDEOFORMATEX CUVIDEOFORMATEX;
+typedef struct _CUVIDPARSERDISPINFO CUVIDPARSERDISPINFO;
+typedef struct _CUVIDPICPARAMS CUVIDPICPARAMS;
+typedef struct _CUVIDSOURCEDATAPACKET CUVIDSOURCEDATAPACKET;
+
+typedef struct _CUVIDPARSERPARAMS
+{