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: Avoid duplicate struct definition to stay compatible with ancient gcc compilers (CentOS 6).

Browse Source
This commit is contained in:
Sebastian Lackner 2015-01-12 20:20:09 +01:00
parent e55bb43544
commit 32d5e2d8e9
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
From 701f3aa88ae330949f2e6618050b6923728ff782 Mon Sep 17 00:00:00 2001
From 84afbf397a3e80bc5e64b5a2af75e027c667195d 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.
@ -9,9 +9,9 @@ Subject: nvcuvid: First implementation.
dlls/nvcuvid/nvcuvid.c | 422 ++++++++++++++++++++++++++++++++++++++++++++++
dlls/nvcuvid/nvcuvid.spec | 24 +++
include/Makefile.in | 2 +
include/cuviddec.h | 32 ++++
include/nvcuvid.h | 67 ++++++++
7 files changed, 552 insertions(+)
include/cuviddec.h | 30 ++++
include/nvcuvid.h | 66 ++++++++
7 files changed, 549 insertions(+)
create mode 100644 dlls/nvcuvid/Makefile.in
create mode 100644 dlls/nvcuvid/nvcuvid.c
create mode 100644 dlls/nvcuvid/nvcuvid.spec
@ -19,10 +19,10 @@ Subject: nvcuvid: First implementation.
create mode 100644 include/nvcuvid.h
diff --git a/configure.ac b/configure.ac
index efc143a..25e853d 100644
index 13e22c5..7c40b45 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3130,6 +3130,7 @@ WINE_CONFIG_TEST(dlls/nvapi/tests)
@@ -3137,6 +3137,7 @@ WINE_CONFIG_TEST(dlls/nvapi/tests)
WINE_CONFIG_DLL(nvapi64,enable_win64)
WINE_CONFIG_DLL(nvcuda)
WINE_CONFIG_TEST(dlls/nvcuda/tests)
@ -520,10 +520,10 @@ index f9eaf44..e29f3e5 100644
odbcinst.h \
diff --git a/include/cuviddec.h b/include/cuviddec.h
new file mode 100644
index 0000000..7fba042
index 0000000..c2301f7
--- /dev/null
+++ b/include/cuviddec.h
@@ -0,0 +1,32 @@
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2015 Michael Müller
+ *
@ -551,17 +551,15 @@ index 0000000..7fba042
+typedef void *CUvideoctxlock;
+
+/* the following structures are documented but we don't need to know the content */
+typedef struct _CUVIDDECODECREATEINFO CUVIDDECODECREATEINFO;
+typedef struct _CUVIDPICPARAMS CUVIDPICPARAMS;
+typedef struct _CUVIDPROCPARAMS CUVIDPROCPARAMS;
+
+#endif /* __WINE_CUVIDDEC_H */
diff --git a/include/nvcuvid.h b/include/nvcuvid.h
new file mode 100644
index 0000000..2de8e3f
index 0000000..4885e45
--- /dev/null
+++ b/include/nvcuvid.h
@@ -0,0 +1,67 @@
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2015 Michael Müller
+ *
@ -598,7 +596,6 @@ index 0000000..2de8e3f
+typedef struct _CUVIDEOFORMAT CUVIDEOFORMAT;
+typedef struct _CUVIDEOFORMATEX CUVIDEOFORMATEX;
+typedef struct _CUVIDPARSERDISPINFO CUVIDPARSERDISPINFO;
+typedef struct _CUVIDPARSERPARAMS CUVIDPARSERPARAMS;
+typedef struct _CUVIDPICPARAMS CUVIDPICPARAMS;
+typedef struct _CUVIDSOURCEDATAPACKET CUVIDSOURCEDATAPACKET;
+