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

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

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

@@ -1,8 +1,8 @@
From 94dc68ec5e72106364d20829ab1ab11e98fa7320 Mon Sep 17 00:00:00 2001
From a1932246122fadf7ade2bf258cf06fea30366523 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 +-
@@ -22,10 +22,10 @@ Subject: [PATCH] dxva2: Initial implementation of MPEG2 decoder using vaapi
create mode 100644 dlls/dxva2/vaapi.c
diff --git a/configure.ac b/configure.ac
index 9163f71..9d5929d 100644
index bf04f97..7954a73 100644
--- a/configure.ac
+++ b/configure.ac
@@ -106,6 +106,8 @@ AC_ARG_WITH(xxf86vm, AS_HELP_STRING([--without-xxf86vm],[do not use XFree vide
@@ -107,6 +107,8 @@ AC_ARG_WITH(xxf86vm, AS_HELP_STRING([--without-xxf86vm],[do not use XFree vide
[if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_xf86vmode_h=no; ac_cv_header_X11_extensions_xf86vmproto_h=no; fi])
AC_ARG_WITH(zlib, AS_HELP_STRING([--without-zlib],[do not use Zlib (data compression)]),
[if test "x$withval" = "xno"; then ac_cv_header_zlib_h=no; fi])
@@ -34,7 +34,7 @@ index 9163f71..9d5929d 100644
AC_ARG_WITH(wine-tools,AS_HELP_STRING([--with-wine-tools=DIR],[use Wine tools from directory DIR]))
AC_ARG_WITH(wine64, AS_HELP_STRING([--with-wine64=DIR],[use the 64-bit Wine in DIR for a Wow64 build]))
@@ -1209,6 +1211,20 @@ This probably prevents linking to OpenGL. Try deleting the file and restarting c
@@ -1210,6 +1212,20 @@ This probably prevents linking to OpenGL. Try deleting the file and restarting c
WINE_WARNING_WITH(opengl,[test -n "$opengl_msg"],[$opengl_msg
OpenGL and Direct3D won't be supported.])
@@ -55,8 +55,8 @@ index 9163f71..9d5929d 100644
CPPFLAGS="$ac_save_CPPFLAGS"
else
X_CFLAGS=""
@@ -3208,7 +3224,7 @@ WINE_CONFIG_LIB(dxerr9)
WINE_CONFIG_DLL(dxgi,,[implib])
@@ -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)