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

Staging: Update --check-libs to show information about libva libs.

Browse Source
This commit is contained in:
Sebastian Lackner 2015-03-09 16:55:13 +01:00
parent da0ea43746
commit 0b477b3ef1
2 changed files with 26 additions and 14 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.39) UNRELEASED; urgency=low
-- Sebastian Lackner <sebastian@fds-team.de> Mon, 09 Mar 2015 16:52:35 +0100
wine-staging (1.7.38) unstable; urgency=low
* Various improvements to patchupdate.py.
* Various improvements to dxva2 vaapi support.

37
patches/Staging/0005-loader-Add-commandline-option-check-libs.patch
View File

@ -1,19 +1,19 @@
From 5f0f1d8dc69cd473f35c874b46e98a34930d0b46 Mon Sep 17 00:00:00 2001
From e71a6c24c41e3d390a81aac1986938a1db71f9e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Wed, 28 May 2014 19:50:51 +0200
Subject: loader: Add commandline option --check-libs.
---
include/wine/library.h | 2 +
libs/wine/config.c | 103 +++++++++++++++++++++++++++++++++++++++++++++++++
libs/wine/loader.c | 36 +++++++++++++++++
libs/wine/config.c | 112 +++++++++++++++++++++++++++++++++++++++++++++++++
libs/wine/loader.c | 36 ++++++++++++++++
libs/wine/wine.def | 2 +
libs/wine/wine.map | 2 +
loader/main.c | 50 +++++++++++++++++++++++-
6 files changed, 194 insertions(+), 1 deletion(-)
loader/main.c | 50 +++++++++++++++++++++-
6 files changed, 203 insertions(+), 1 deletion(-)
diff --git a/include/wine/library.h b/include/wine/library.h
index 242bb69..fa1e339 100644
index fae73fe..7395a11 100644
--- a/include/wine/library.h
+++ b/include/wine/library.h
@@ -40,6 +40,7 @@ extern "C" {
@ -24,7 +24,7 @@ index 242bb69..fa1e339 100644
extern const char *wine_get_server_dir(void);
extern const char *wine_get_user_name(void);
extern const char *wine_get_version(void);
@@ -51,6 +52,7 @@ extern void wine_exec_wine_binary( const char *name, char **argv, const char *en
@@ -52,6 +53,7 @@ extern void wine_exec_wine_binary( const char *name, char **argv, const char *en
typedef void (*load_dll_callback_t)( void *, const char * );
@ -33,10 +33,10 @@ index 242bb69..fa1e339 100644
extern void *wine_dlsym( void *handle, const char *symbol, char *error, size_t errorsize );
extern int wine_dlclose( void *handle, char *error, size_t errorsize );
diff --git a/libs/wine/config.c b/libs/wine/config.c
index a273502..58e4977 100644
index 5262c76..7acf51b 100644
--- a/libs/wine/config.c
+++ b/libs/wine/config.c
@@ -444,6 +444,109 @@ const char *wine_get_build_dir(void)
@@ -444,6 +444,118 @@ const char *wine_get_build_dir(void)
return build_dir;
}
@ -104,6 +104,15 @@ index a273502..58e4977 100644
+#ifdef SONAME_LIBV4L1
+ SONAME_LIBV4L1,
+#endif
+#ifdef SONAME_LIBVA
+ SONAME_LIBVA,
+#endif
+#ifdef SONAME_LIBVA_DRM
+ SONAME_LIBVA_DRM,
+#endif
+#ifdef SONAME_LIBVA_X11
+ SONAME_LIBVA_X11,
+#endif
+#ifdef SONAME_LIBX11
+ SONAME_LIBX11,
+#endif
@ -194,7 +203,7 @@ index 3591ede..2718857 100644
*/
void *wine_dlsym( void *handle, const char *symbol, char *error, size_t errorsize )
diff --git a/libs/wine/wine.def b/libs/wine/wine.def
index ed315bd..b6acbce 100644
index 5b42029..6acf329 100644
--- a/libs/wine/wine.def
+++ b/libs/wine/wine.def
@@ -64,6 +64,7 @@ EXPORTS
@ -214,7 +223,7 @@ index ed315bd..b6acbce 100644
wine_get_sortkey
wine_get_user_name
diff --git a/libs/wine/wine.map b/libs/wine/wine.map
index 2159fac..91ace06 100644
index 7cb2918..72ffed8 100644
--- a/libs/wine/wine.map
+++ b/libs/wine/wine.map
@@ -65,6 +65,7 @@ WINE_1.0
@ -234,7 +243,7 @@ index 2159fac..91ace06 100644
wine_get_sortkey;
wine_get_ss;
diff --git a/loader/main.c b/loader/main.c
index 76bf324..36738f2 100644
index fa0efa2..e96363d 100644
--- a/loader/main.c
+++ b/loader/main.c
@@ -36,6 +36,12 @@
@ -260,7 +269,7 @@ index 76bf324..36738f2 100644
if (argc <= 1)
{
@@ -135,6 +142,47 @@ static void check_command_line( int argc, char *argv[] )
@@ -146,6 +153,47 @@ static void check_command_line( int argc, char *argv[] )
exit(0);
}
@ -309,5 +318,5 @@ index 76bf324..36738f2 100644
--
2.1.2
2.3.1