wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix configure changes

Browse Source
This commit is contained in:
Zebediah Figura
2018-02-23 14:52:23 -06:00
parent e180b2e4dd
commit 7b0a3f25ac
11 changed files with 91 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/dxva2-Video_Decoder/0006-dxva2-tests-Add-tests-for-dxva2-decoder.patch
View File

@@ -1,4 +1,4 @@
From 6dff4fbc02c7281a02c26d6ef46df3db9a65b20f Mon Sep 17 00:00:00 2001
From 48e3213aa30f783ebc6a1c099c374ae9a69a8697 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sun, 22 Feb 2015 01:21:18 +0100
Subject: [PATCH] dxva2/tests: Add tests for dxva2 decoder.
@@ -12,10 +12,10 @@ Subject: [PATCH] dxva2/tests: Add tests for dxva2 decoder.
create mode 100644 dlls/dxva2/tests/dxva2.c
diff --git a/configure.ac b/configure.ac
index a36ae73..9163f71 100644
index 7b796ef..4a93549 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3209,6 +3209,7 @@ WINE_CONFIG_DLL(dxgi,,[implib])
@@ -3212,6 +3212,7 @@ WINE_CONFIG_DLL(dxgi)
WINE_CONFIG_TEST(dlls/dxgi/tests)
WINE_CONFIG_LIB(dxguid)
WINE_CONFIG_DLL(dxva2)
@@ -412,5 +412,5 @@ index 0000000..dcbb990
+ test_decoder_service(window);
+}
--
1.9.1
2.7.4

23
patches/dxva2-Video_Decoder/0007-dxva2-Initial-implementation-of-MPEG2-decoder-using-.patch
View File

@@ -1,11 +1,11 @@
From a1932246122fadf7ade2bf258cf06fea30366523 Mon Sep 17 00:00:00 2001
From 161924178484a0b2835946704241d2ae287202f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sun, 22 Feb 2015 01:25:20 +0100
Subject: [PATCH] dxva2: Initial implementation of MPEG2 decoder
using vaapi backend.
Subject: [PATCH] dxva2: Initial implementation of MPEG2 decoder using
vaapi backend.
---
configure.ac | 18 +-
configure.ac | 16 +
dlls/dxva2/Makefile.in | 12 +-
dlls/dxva2/backend.idl | 96 ++++++
dlls/dxva2/dxva2_private.h | 115 ++++++-
@@ -15,14 +15,14 @@ Subject: [PATCH] dxva2: Initial implementation of MPEG2 decoder
dlls/dxva2/vaapi-mpeg2.c | 753 +++++++++++++++++++++++++++++++++++++++++++
dlls/dxva2/vaapi.c | 767 ++++++++++++++++++++++++++++++++++++++++++++
dlls/dxva2/videoservices.c | 74 ++---
10 files changed, 2293 insertions(+), 67 deletions(-)
10 files changed, 2292 insertions(+), 66 deletions(-)
create mode 100644 dlls/dxva2/backend.idl
create mode 100644 dlls/dxva2/genericdecoder.c
create mode 100644 dlls/dxva2/vaapi-mpeg2.c
create mode 100644 dlls/dxva2/vaapi.c
diff --git a/configure.ac b/configure.ac
index bf04f97..7954a73 100644
index 4a93549..f5a20d5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -107,6 +107,8 @@ AC_ARG_WITH(xxf86vm, AS_HELP_STRING([--without-xxf86vm],[do not use XFree vide
@@ -55,15 +55,6 @@ index bf04f97..7954a73 100644
CPPFLAGS="$ac_save_CPPFLAGS"
else
X_CFLAGS=""
@@ -3219,7 +3235,7 @@ WINE_CONFIG_LIB(dxerr9)
WINE_CONFIG_DLL(dxgi)
WINE_CONFIG_TEST(dlls/dxgi/tests)
WINE_CONFIG_LIB(dxguid)
-WINE_CONFIG_DLL(dxva2)
+WINE_CONFIG_DLL(dxva2,,[clean])
WINE_CONFIG_TEST(dlls/dxva2/tests)
WINE_CONFIG_DLL(esent)
WINE_CONFIG_DLL(evr)
diff --git a/dlls/dxva2/Makefile.in b/dlls/dxva2/Makefile.in
index d484cb1..68a7e3c 100644
--- a/dlls/dxva2/Makefile.in
@@ -2644,5 +2635,5 @@ index 46e431a..84222dc 100644
return E_NOINTERFACE;
}
--
1.9.1
2.7.4