Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x11 library*:rebuild verbump

Browse Source
This commit is contained in:
Rmys
2019-10-25 21:07:45 +03:00
parent 3059c3ce5e
commit 4b2fc4f2b5
2 changed files with 76 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
x11/driver/libva-intel-driver/files/427.patch
+65
View File
@@ -0,0 +1,65 @@
From 0abb7a1c938437000bfca1a9b3706884467c681e Mon Sep 17 00:00:00 2001
From: Haihao Xiang <haihao.xiang@intel.com>
Date: Fri, 7 Dec 2018 13:31:43 +0800
Subject: [PATCH] Check the interface from libva first
This fixes https://github.com/intel/intel-vaapi-driver/issues/419
Signed-off-by: Haihao Xiang <haihao.xiang@intel.com>
---
src/i965_output_wayland.c | 27 ++++++++++++++++-----------
1 file changed, 16 insertions(+), 11 deletions(-)
diff --git a/src/i965_output_wayland.c b/src/i965_output_wayland.c
index 122db953..a637552e 100644
--- a/src/i965_output_wayland.c
+++ b/src/i965_output_wayland.c
@@ -397,6 +397,7 @@ i965_output_wayland_init(VADriverContextP ctx)
struct i965_driver_data * const i965 = i965_driver_data(ctx);
struct dso_handle *dso_handle;
struct wl_vtable *wl_vtable;
+ struct VADriverVTableWayland * const vtable = ctx->vtable_wayland;
static const struct dso_symbol libegl_symbols[] = {
{
@@ -465,25 +466,29 @@ i965_output_wayland_init(VADriverContextP ctx)
if (!i965->wl_output)
goto error;
- i965->wl_output->libegl_handle = dso_open(LIBEGL_NAME);
- if (!i965->wl_output->libegl_handle) {
- i965->wl_output->libegl_handle = dso_open(LIBEGL_NAME_FALLBACK);
- if (!i965->wl_output->libegl_handle)
+ wl_vtable = &i965->wl_output->vtable;
+
+ if (vtable->wl_interface)
+ wl_vtable->drm_interface = vtable->wl_interface;
+ else {
+ i965->wl_output->libegl_handle = dso_open(LIBEGL_NAME);
+ if (!i965->wl_output->libegl_handle) {
+ i965->wl_output->libegl_handle = dso_open(LIBEGL_NAME_FALLBACK);
+ if (!i965->wl_output->libegl_handle)
+ goto error;
+ }
+
+ dso_handle = i965->wl_output->libegl_handle;
+ if (!dso_get_symbols(dso_handle, wl_vtable, sizeof(*wl_vtable),
+ libegl_symbols))
goto error;
}
- dso_handle = i965->wl_output->libegl_handle;
- wl_vtable = &i965->wl_output->vtable;
- if (!dso_get_symbols(dso_handle, wl_vtable, sizeof(*wl_vtable),
- libegl_symbols))
- goto error;
-
i965->wl_output->libwl_client_handle = dso_open(LIBWAYLAND_CLIENT_NAME);
if (!i965->wl_output->libwl_client_handle)
goto error;
dso_handle = i965->wl_output->libwl_client_handle;
- wl_vtable = &i965->wl_output->vtable;
if (!dso_get_symbols(dso_handle, wl_vtable, sizeof(*wl_vtable),
libwl_client_symbols))
goto error;
x11/driver/libva-intel-driver/pspec.xml
+11 -1
View File
@@ -12,12 +12,15 @@
<IsA>driver</IsA>
<Summary>VA-API implementation for Intel G45 and HD Graphics family</Summary>
<Description>libva-intel-driver, VA-API implementation for Intel G45 and HD Graphics family.</Description>
<Archive sha1sum="a40c6bd89b71b547986bf9f9fa2533bb50cf269e" type="tarbz2">https://github.com/01org/intel-vaapi-driver/releases/download/2.1.0/intel-vaapi-driver-2.1.0.tar.bz2</Archive>
<Archive sha1sum="89096f99da753ac5858304e6c17f5dd9e7581d5b" type="tarbz2">https://github.com/01org/intel-vaapi-driver/releases/download/2.3.0/intel-vaapi-driver-2.3.0.tar.bz2</Archive>
<BuildDependencies>
<Dependency>libdrm-devel</Dependency>
<Dependency>libX11-devel</Dependency>
<Dependency versionFrom="1.7.3">libva-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">427.patch</Patch>
</Patches>
</Source>
<Package>
@@ -34,6 +37,13 @@
</Package>
<History>
<Update release="9">
<Date>2019-10-25</Date>
<Version>2.3.0</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="8">
<Date>2018-07-31</Date>
<Version>2.1.0</Version>